October 2017 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 23384: Add user brade on build-sunet-a.torproject.net
by boklm＠torproject.org 23 Oct '17

23 Oct '17

commit eec1680facf5b805e8860daa70602ab6b43272aa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 23 21:00:18 2017 +0200 Bug 23384: Add user brade on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/files/brade.pub | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/ansible/roles/tbb-team/defaults/main.yml b/tools/ansible/roles/tbb-team/defaults/main.yml index fff2def..cf54157 100644 --- a/tools/ansible/roles/tbb-team/defaults/main.yml +++ b/tools/ansible/roles/tbb-team/defaults/main.yml @@ -1,5 +1,6 @@ --- tbb_team_members: - boklm + - brade - gk - mcs diff --git a/tools/ansible/roles/tbb-team/files/brade.pub b/tools/ansible/roles/tbb-team/files/brade.pub new file mode 100644 index 0000000..0a83b4d --- /dev/null +++ b/tools/ansible/roles/tbb-team/files/brade.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+p9eNuVj59oHkPe/uM+DFTchAxMsm1F6jsMMQqzcNd2sIVAxftMEu8OTM5/rdz+XemevzE+BYHhNUamW/05rur97AYJB7hsOYBtx0g9tGx/2zot72yU38TjmbhWE1FKct+9zc6ZQnYHXLtWBB6k/zJeQH2CvwDLrHsXxfUvOE9lXrcgFy1ugVC96EknBfqz5LTG2dsQhn+nzpEnb3IZYoaRc0h33BVGLkNyFQEtm+7JzylTX6/854kk1BqwZLl03U6++7XA4SjVOYPCM3K1++dJt3CwnARs7mR3t03FFUj0gyRoPuxB6iwPtaCDIDEhSOMmj8hfbFu1N4jm4XY1H3

1 0

[tor-browser-build/master] Bug 23899: use tmp_dir from rbm.conf in update_responses
by gk＠torproject.org 23 Oct '17

23 Oct '17

commit c64f614475954951619856f58e06f7890ff9fef2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 23 19:30:40 2017 +0200 Bug 23899: use tmp_dir from rbm.conf in update_responses --- projects/release/update_responses_config.yml | 1 + tools/update-responses/update_responses | 23 +++++++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index 69d8909..8d945dc 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -1,4 +1,5 @@ --- +tmp_dir: '[% c("tmp_dir") %]' appname_marfile: tor-browser appname_bundle_osx: TorBrowser appname_bundle_linux: tor-browser diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 0ed19c1..9303ed1 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -41,6 +41,13 @@ sub exit_error { exit (exists $_[1] ? $_[1] : 1); } +sub get_tmpdir { + my ($config) = @_; + return File::Temp->newdir($config->{tmp_dir} ? + (DIR => $config->{tmp_dir}) + : ()); +} + sub build_targets_by_os { return ($_[0]) unless $config->{build_targets}{$_[0]}; my $r = $config->{build_targets}{$_[0]}; @@ -197,7 +204,7 @@ sub create_incremental_mar { }; }; return if $pm->start($finished_file); - my $tmpdir = File::Temp->newdir(); + my $tmpdir = get_tmpdir($config); extract_mar(mar_filename($appname, $from_version, $os, $lang), "$tmpdir/A"); extract_mar(mar_filename($appname, $new_version, $os, $lang), "$tmpdir/B"); if ($ENV{CHECK_CODESIGNATURE_EXISTS}) { @@ -254,12 +261,12 @@ sub channel_to_version { sub get_buildinfos { my ($config, $version) = @_; return if exists $config->{versions}{$version}{buildID}; - extract_martools($version); + extract_martools($config, $version); my $files = $config->{versions}{$version}{files}; foreach my $os (keys %$files) { foreach my $lang (keys %{$files->{$os}}) { next unless $files->{$os}{$lang}{complete}; - my $tmpdir = File::Temp->newdir(); + my $tmpdir = get_tmpdir($config); extract_mar( mar_filename($config->{appname_marfile}, $version, $os, $lang), "$tmpdir"); @@ -412,10 +419,10 @@ sub osname { my $martools_tmpdir; sub extract_martools { - my ($version) = @_; + my ($config, $version) = @_; my $osname = osname; my $marzip = "$releases_dir/$version/mar-tools-$osname.zip"; - $martools_tmpdir = File::Temp->newdir(); + $martools_tmpdir = get_tmpdir($config); my $old_cwd = getcwd; chdir $martools_tmpdir; my (undef, undef, $success) = capture_exec('unzip', $marzip); @@ -513,7 +520,7 @@ sub check_update_responses_channel { sub download_version { my ($config, $version) = @_; - my $tmpdir = File::Temp->newdir(); + my $tmpdir = get_tmpdir($config); my $destdir = "$releases_dir/$version"; my $urldir = "$config->{download}{archive_url}/$version"; print "Downloading version $version\n"; @@ -548,7 +555,7 @@ sub download_version { unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); move "$tmpdir/$martools", "$destdir/$martools"; move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; - extract_martools($version); + extract_martools($config, $version); foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { print "Downloading $file\n"; @@ -619,7 +626,7 @@ my %actions = ( gen_incrementals => sub { my ($config) = @_; foreach my $version (channel_to_version($config, @ARGV)) { - extract_martools($version); + extract_martools($config, $version); get_version_files($config, $version); create_incremental_mars_for_version($config, $version); }

1 0

[torbutton/master] Bug 23949: Fix bug in donation banner that prevented display
by gk＠torproject.org 23 Oct '17

23 Oct '17

commit 5feba9668e9d8ec7098d605a1442820282779960 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Oct 22 18:19:33 2017 -0700 Bug 23949: Fix bug in donation banner that prevented display --- src/modules/donation-banner.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/donation-banner.js b/src/modules/donation-banner.js index 3a954e5..ac397e5 100644 --- a/src/modules/donation-banner.js +++ b/src/modules/donation-banner.js @@ -52,7 +52,8 @@ const gStringBundle = Services.strings.createBundle(kPropertiesURL); const shouldShowBanner = function (shortLocale) { try { // If our override test pref is true, then just show the banner regardless. - if (Services.prefs.getBoolPref("extensions.torbutton.testBanner", false)) { + if (Services.prefs.prefHasUserValue("extensions.torbutton.testBanner") && + Services.prefs.getBoolPref("extensions.torbutton.testBanner") === true) { return true; } // Don't show a banner if update is needed.

1 0

[torbutton/master] Translations update
by gk＠torproject.org 23 Oct '17

23 Oct '17

commit b35a3e2faab4e73321c336c081d7248138937daa Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 23 05:48:34 2017 +0000 Translations update --- src/chrome/locale/fa/aboutTor.properties | 14 +++++++------- src/chrome/locale/fa/torbutton.dtd | 2 +- src/chrome/locale/nl/aboutTor.properties | 8 ++++---- src/chrome/locale/nl/torbutton.dtd | 2 +- src/chrome/locale/sv/torbutton.dtd | 12 ++++++------ src/chrome/locale/sv/torbutton.properties | 2 +- src/chrome/locale/zh-CN/torbutton.dtd | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/chrome/locale/fa/aboutTor.properties b/src/chrome/locale/fa/aboutTor.properties index 3458e6e..58c75b2 100644 --- a/src/chrome/locale/fa/aboutTor.properties +++ b/src/chrome/locale/fa/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=اکنون اهداء کنید! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: قدرت مقاومت دیجیتال aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline1=درحال حفاظت از خبرنگاران, افشاگران و اکتیویست ها از سال 2006 +aboutTor.donationBanner.tagline2=آزادی شبکه در جهان +aboutTor.donationBanner.tagline3=آزادی آنلاین +aboutTor.donationBanner.tagline4=درحال پرورش آزادی گفتار در جهان +aboutTor.donationBanner.tagline5=درحال حفاظت ار حریم خصوصی میلیون ها مردم هر روز diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 712e448..bd3eb16 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -47,7 +47,7 @@ <!ENTITY torbutton.prefs.sec_mathml_desc "برخی مکانیسم ها نمایش معادلات ریاضی غیر فعال می باشد."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML غیر فعال است."> <!ENTITY torbutton.prefs.sec_medium "متوسط"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "بهینه سازی عملکرد در سایت های حاوی جاوا اسکریپت غیرفعال شده است."> <!ENTITY torbutton.prefs.sec_font_rend_desc "برخی از ویژگی های رندر فونت غیر فعال می باشد."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "مکانیسم گرافیت رندر فونت غیر فعال است."> <!ENTITY torbutton.prefs.sec_svg_desc "برخی از انواع تصاویر غیر فعال هستند."> diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties index 521f96f..1604a0e 100644 --- a/src/chrome/locale/nl/aboutTor.properties +++ b/src/chrome/locale/nl/aboutTor.properties @@ -10,11 +10,11 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Doneer nu! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: Digitale tegenspraak aanmoedigen +aboutTor.donationBanner.mozilla=Geef vandaag en Mozilla zal u gift koppelen! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline1=Beschermen van Journalisten, Whistleblowers, & Activisten sinds 2006 aboutTor.donationBanner.tagline2=Wereldwijde Netwerk Vrijheid aboutTor.donationBanner.tagline3=Online Vrijheid -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline4=Bevorderen van gratis wereldwijde vrije mening aboutTor.donationBanner.tagline5=Beveiligt de privacy van miljoenen gebruikers per dag diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index 5fcfcf7..cce0b9d 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Vink dit vakje aan om te voorkomen dat functies van je browser worden misbruikt om je te volgen op het internet. Gemodificeerde functies zijn o.a. URL's, uitzendingskanalen, de browsercache, cookies, favicons, HTTP Auth headers, koppeling-voorverbindingen, lokale opslag, mediabron-URL's, OCSP-verzoeken, Gedeelde-werkers en TLS-sessietickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Houd deze box aangevinkt om dingen te verbergen voor website die uniek kunnen zijn voor u, inclusief uw computer prestaties, toetsenbord layout, locatie, de locatie van geïnstalleerde plugins, de lijst van geïnstalleerde plugins, uw netwerk status, scherm oriëntatie, scherm grootte, site-specifieke zoom levels, ondersteunde bestands types, systeem kleuren, en WebGL mogelijkheden."> <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau"> <!ENTITY torbutton.prefs.sec_caption_tooltip "De beveiligingsschuifbalk laat je toe sommige functies uit te schakelen die je browser mogelijk blootstellen aan beveiligingsrisico's."> <!ENTITY torbutton.prefs.sec_low "Laag (standaard)"> diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index e1b50cb..8f590c2 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -39,11 +39,11 @@ <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Användande av SVG OpenType-typsnitt är avaktiverad."> <!ENTITY torbutton.prefs.sec_gen_desc "På den här säkerhetsnivån gäller följande förändringar (håll markören över för detaljer):"> <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 ljud- och bildmedia blir click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "På vissa webbsidor kan du vara tvungen att aktivera dessa mediatyper via NoScript-knappen."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "På vissa webbplatser kan du vara tvungen att aktivera dessa mediatyper via NoScript-knappen i verktygsfältet."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Vissa prestandaoptimeringar av JavaScript är inaktiverade."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Skript på vissa webbsidor kan gå långsammare."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Skript på vissa webbplatser kan gå långsammare."> <!ENTITY torbutton.prefs.sec_mathml_desc "Vissa funktioner för att visa matematiska formler är avaktiverade."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML är inaktiverat."> <!ENTITY torbutton.prefs.sec_medium "Medium"> @@ -52,10 +52,10 @@ <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Användande av Graphite-typsnitt är avaktiverad."> <!ENTITY torbutton.prefs.sec_svg_desc "Vissa typer av bilder är inaktiverade."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG-bilder är inaktiverade."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript är normalt avaktiverat på alla webbsidor som inte använder HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan aktiveras för enskilda webbsidor via NoScript-knappen."> +<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript är normalt avaktiverat på alla webbplatser som inte använder HTTPS."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan aktiveras för enskilda webbplatser via NoScript-knappen i verktygsfältet."> <!ENTITY torbutton.prefs.sec_high "Hög"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript är normalt avaktiverat på alla webbsidor."> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript är normalt avaktiverat på alla webbplatser."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Vissa typsnitt ock ikoner kan visas felaktigt."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahålls av webbsidor är blockerade."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahålls av webbplatser är blockerade."> <!ENTITY torbutton.circuit_display.title "Tor-krets för den här webbplatsen"> diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 8102e83..2f6a913 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -18,7 +18,7 @@ torbutton.popup.external.suggest = Det är säkrast att öppna filer du har häm torbutton.popup.launch = Hämta hem filen torbutton.popup.cancel = Avbryt torbutton.popup.dontask = Hämta hem filer automatiskt i fortsättningen -torbutton.popup.prompted_language = För ett bättre integritetsskydd kan Torbutton begära den engelska versionen av webbsidor. Detta kan göra att webbsidor som du föredrar att läsa på ditt modersmål visas på engelska istället.\\\n\\\n Vill du visa sidor på engelska för att få ett bättre integritetsskydd? +torbutton.popup.prompted_language = För ett bättre integritetsskydd kan Torbutton begära den engelska versionen av webbplatser. Detta kan göra att webbplatser som du föredrar att läsa på ditt modersmål visas på engelska istället.\\\n\\\n Vill du visa sidor på engelska för att få ett bättre integritetsskydd? torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle? torbutton.title.prompt_torbrowser = Viktig information om Torbutton torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Tor Browser och ladda ner Tor Browser Bundle. Tor Browser skyddar ditt privatliv bättre än vanliga Firefox, även när Firefox används med Tor Browser.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta bort-knappen bredvid Torbutton. diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index b153d8f..16bbfda 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -12,7 +12,7 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> <!ENTITY torbutton.prefs.security_settings "Tor 浏览器安全设置"> -<!ENTITY torbutton.prefs.restore_defaults "恢复默认"> +<!ENTITY torbutton.prefs.restore_defaults "恢复默认设置"> <!ENTITY torbutton.prefs.custom_warning "您自定义的浏览器设置导致了不安全的安全设置。出于安全和隐私考虑，我们建议您选择一个默认的安全级别。"> <!ENTITY torbutton.cookiedialog.title "管理受保护的 Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "受保护"> @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "该选项用于防止滥用浏览器功能跟踪用户。修改的功能包括：blob 网址，广播通道，浏览器缓存，cookie，收藏夹图标，HTTP 验证头部，预连接，localStorage，mediaSource 网址，OCSP 请求，SharedWorker 和 TLS 会话票证。"> <!ENTITY torbutton.prefs.resist_fingerprinting "修改 Tor 浏览器中可区分你与其他 Tor 用户的细节信息"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "选中此框以避免网站获取识别您的指纹，包括您的计算机性能、键盘布局、语言区域、已安装插件位置、已安装插件列表、您的网络状态、屏幕方向、屏幕尺寸、特定网站缩放级别、支持的文件类型、系统颜色、WebGL 能力。"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "勾选此选项以避免网站获取您的浏览器指纹信息，包括您的计算机性能、键盘布局、系统语言、安装插件的位置、已安装插件列表、您的网络状态、屏幕方向、屏幕尺寸、特定网站缩放级别、支持的文件类型、系统颜色、WebGL 功能。"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> <!ENTITY torbutton.prefs.sec_caption_tooltip "安全滑块可禁用某些浏览器功能，避免因这些功能导致的漏洞而受到攻击。"> <!ENTITY torbutton.prefs.sec_low "低（默认）">

1 0

[torbutton/master] Update locales with translated banner
by gk＠torproject.org 23 Oct '17

23 Oct '17

commit 7ed85fa7a7097c96b2ed1bcd1cb6181f41f58aac Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 23 06:04:39 2017 +0000 Update locales with translated banner --- src/modules/donation-banner.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/modules/donation-banner.js b/src/modules/donation-banner.js index ac397e5..6c205fe 100644 --- a/src/modules/donation-banner.js +++ b/src/modules/donation-banner.js @@ -7,17 +7,15 @@ Cu.import("resource://gre/modules/Services.jsm"); // A list of locales for which the banner has been translated. const kBannerLocales = [ - "bg", - "da", "de", - "el", "en", "es", + "fa", "fr", - "is", "it", + "nl", + "pl", "pt", - "nb", "ru", "sv", "tr",

1 0

[tor-browser-bundle/maint-7.0] Release preparations for 7.0.8
by gk＠torproject.org 23 Oct '17

23 Oct '17

commit 0f57cc689ea49c86fa4077abe0e97fe1a18cf509 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 23 06:13:39 2017 +0000 Release preparations for 7.0.8 Torbutton version bump, CHANGELOG update, and config.yml updates --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ gitian/versions | 2 +- tools/update-responses/config.yml | 7 ++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index b4673a2..835426f 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 7.0.8 -- October 25 2017 + * All Platforms + * Update Torbutton to 1.9.7.9 + * Bug 23949: Fix donation banner display + * Update locales with translated banner + * Translations update + Tor Browser 7.0.7 -- October 19 2017 * All Platforms * Update Firefox to 52.4.1esr diff --git a/gitian/versions b/gitian/versions index e5e9ade..cc09cb0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -17,7 +17,7 @@ TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 TOR_TAG=tor-0.3.1.7 TORLAUNCHER_TAG=0.2.12.3 -TORBUTTON_TAG=1.9.7.8 +TORBUTTON_TAG=1.9.7.9 HTTPSE_TAG=2017.10.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 1eceba9..82fa8f0 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,13 +20,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.7 + release: 7.0.8 versions: - 7.0.7: + 7.0.8: platformVersion: 52.4.1 - detailsURL: https://blog.torproject.org/tor-browser-707-released + detailsURL: https://blog.torproject.org/tor-browser-708-released incremental_from: - 7.0.6 + - 7.0.7 migrate_archs: osx32: osx64 migrate_langs:

1 0

[torbutton/maint-1.9.7] Bug 23949: Fix bug in donation banner that prevented display
by gk＠torproject.org 23 Oct '17

23 Oct '17

commit f58bab3851c28fbb8145552349bfdaf62ee1054e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Oct 22 18:19:33 2017 -0700 Bug 23949: Fix bug in donation banner that prevented display --- src/modules/donation-banner.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/donation-banner.js b/src/modules/donation-banner.js index 3a954e5..ac397e5 100644 --- a/src/modules/donation-banner.js +++ b/src/modules/donation-banner.js @@ -52,7 +52,8 @@ const gStringBundle = Services.strings.createBundle(kPropertiesURL); const shouldShowBanner = function (shortLocale) { try { // If our override test pref is true, then just show the banner regardless. - if (Services.prefs.getBoolPref("extensions.torbutton.testBanner", false)) { + if (Services.prefs.prefHasUserValue("extensions.torbutton.testBanner") && + Services.prefs.getBoolPref("extensions.torbutton.testBanner") === true) { return true; } // Don't show a banner if update is needed.

1 0

[torbutton/maint-1.9.7] Translations update
by gk＠torproject.org 23 Oct '17

23 Oct '17

commit 9c2dbede4221056824013d0c284b66c476fba748 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 23 05:48:34 2017 +0000 Translations update --- src/chrome/locale/fa/aboutTor.properties | 14 +++++++------- src/chrome/locale/fa/torbutton.dtd | 2 +- src/chrome/locale/nl/aboutTor.properties | 8 ++++---- src/chrome/locale/nl/torbutton.dtd | 2 +- src/chrome/locale/sv/torbutton.dtd | 12 ++++++------ src/chrome/locale/sv/torbutton.properties | 2 +- src/chrome/locale/zh-CN/torbutton.dtd | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/chrome/locale/fa/aboutTor.properties b/src/chrome/locale/fa/aboutTor.properties index 3458e6e..58c75b2 100644 --- a/src/chrome/locale/fa/aboutTor.properties +++ b/src/chrome/locale/fa/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=اکنون اهداء کنید! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: قدرت مقاومت دیجیتال aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline1=درحال حفاظت از خبرنگاران, افشاگران و اکتیویست ها از سال 2006 +aboutTor.donationBanner.tagline2=آزادی شبکه در جهان +aboutTor.donationBanner.tagline3=آزادی آنلاین +aboutTor.donationBanner.tagline4=درحال پرورش آزادی گفتار در جهان +aboutTor.donationBanner.tagline5=درحال حفاظت ار حریم خصوصی میلیون ها مردم هر روز diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 712e448..bd3eb16 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -47,7 +47,7 @@ <!ENTITY torbutton.prefs.sec_mathml_desc "برخی مکانیسم ها نمایش معادلات ریاضی غیر فعال می باشد."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML غیر فعال است."> <!ENTITY torbutton.prefs.sec_medium "متوسط"> -<!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled."> +<!ENTITY torbutton.prefs.sec_all_jit_desc "بهینه سازی عملکرد در سایت های حاوی جاوا اسکریپت غیرفعال شده است."> <!ENTITY torbutton.prefs.sec_font_rend_desc "برخی از ویژگی های رندر فونت غیر فعال می باشد."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "مکانیسم گرافیت رندر فونت غیر فعال است."> <!ENTITY torbutton.prefs.sec_svg_desc "برخی از انواع تصاویر غیر فعال هستند."> diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties index 521f96f..1604a0e 100644 --- a/src/chrome/locale/nl/aboutTor.properties +++ b/src/chrome/locale/nl/aboutTor.properties @@ -10,11 +10,11 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Doneer nu! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: Digitale tegenspraak aanmoedigen +aboutTor.donationBanner.mozilla=Geef vandaag en Mozilla zal u gift koppelen! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline1=Beschermen van Journalisten, Whistleblowers, & Activisten sinds 2006 aboutTor.donationBanner.tagline2=Wereldwijde Netwerk Vrijheid aboutTor.donationBanner.tagline3=Online Vrijheid -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline4=Bevorderen van gratis wereldwijde vrije mening aboutTor.donationBanner.tagline5=Beveiligt de privacy van miljoenen gebruikers per dag diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd index 5fcfcf7..cce0b9d 100644 --- a/src/chrome/locale/nl/torbutton.dtd +++ b/src/chrome/locale/nl/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Vink dit vakje aan om te voorkomen dat functies van je browser worden misbruikt om je te volgen op het internet. Gemodificeerde functies zijn o.a. URL's, uitzendingskanalen, de browsercache, cookies, favicons, HTTP Auth headers, koppeling-voorverbindingen, lokale opslag, mediabron-URL's, OCSP-verzoeken, Gedeelde-werkers en TLS-sessietickets."> <!ENTITY torbutton.prefs.resist_fingerprinting "Verander details die je onderscheiden van andere Tor Browser gebruikers"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Houd deze box aangevinkt om dingen te verbergen voor website die uniek kunnen zijn voor u, inclusief uw computer prestaties, toetsenbord layout, locatie, de locatie van geïnstalleerde plugins, de lijst van geïnstalleerde plugins, uw netwerk status, scherm oriëntatie, scherm grootte, site-specifieke zoom levels, ondersteunde bestands types, systeem kleuren, en WebGL mogelijkheden."> <!ENTITY torbutton.prefs.sec_caption "Beveiligingsniveau"> <!ENTITY torbutton.prefs.sec_caption_tooltip "De beveiligingsschuifbalk laat je toe sommige functies uit te schakelen die je browser mogelijk blootstellen aan beveiligingsrisico's."> <!ENTITY torbutton.prefs.sec_low "Laag (standaard)"> diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index e1b50cb..8f590c2 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -39,11 +39,11 @@ <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Användande av SVG OpenType-typsnitt är avaktiverad."> <!ENTITY torbutton.prefs.sec_gen_desc "På den här säkerhetsnivån gäller följande förändringar (håll markören över för detaljer):"> <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 ljud- och bildmedia blir click-to-play via NoScript."> -<!ENTITY torbutton.prefs.sec_html5_tooltip "På vissa webbsidor kan du vara tvungen att aktivera dessa mediatyper via NoScript-knappen."> +<!ENTITY torbutton.prefs.sec_html5_tooltip "På vissa webbplatser kan du vara tvungen att aktivera dessa mediatyper via NoScript-knappen i verktygsfältet."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Vissa prestandaoptimeringar av JavaScript är inaktiverade."> <!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Native RegExp."> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT."> -<!ENTITY torbutton.prefs.sec_jit_slower_desc "Skript på vissa webbsidor kan gå långsammare."> +<!ENTITY torbutton.prefs.sec_jit_slower_desc "Skript på vissa webbplatser kan gå långsammare."> <!ENTITY torbutton.prefs.sec_mathml_desc "Vissa funktioner för att visa matematiska formler är avaktiverade."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML är inaktiverat."> <!ENTITY torbutton.prefs.sec_medium "Medium"> @@ -52,10 +52,10 @@ <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "Användande av Graphite-typsnitt är avaktiverad."> <!ENTITY torbutton.prefs.sec_svg_desc "Vissa typer av bilder är inaktiverade."> <!ENTITY torbutton.prefs.sec_svg_desc_tooltip "SVG-bilder är inaktiverade."> -<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript är normalt avaktiverat på alla webbsidor som inte använder HTTPS."> -<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan aktiveras för enskilda webbsidor via NoScript-knappen."> +<!ENTITY torbutton.prefs.sec_js_https_desc "JavaScript är normalt avaktiverat på alla webbplatser som inte använder HTTPS."> +<!ENTITY torbutton.prefs.sec_js_desc_tooltip "JavaScript kan aktiveras för enskilda webbplatser via NoScript-knappen i verktygsfältet."> <!ENTITY torbutton.prefs.sec_high "Hög"> -<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript är normalt avaktiverat på alla webbsidor."> +<!ENTITY torbutton.prefs.sec_all_js_desc "JavaScript är normalt avaktiverat på alla webbplatser."> <!ENTITY torbutton.prefs.sec_webfonts_desc "Vissa typsnitt ock ikoner kan visas felaktigt."> -<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahålls av webbsidor är blockerade."> +<!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Typsnitt som tillhandahålls av webbplatser är blockerade."> <!ENTITY torbutton.circuit_display.title "Tor-krets för den här webbplatsen"> diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 8102e83..2f6a913 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -18,7 +18,7 @@ torbutton.popup.external.suggest = Det är säkrast att öppna filer du har häm torbutton.popup.launch = Hämta hem filen torbutton.popup.cancel = Avbryt torbutton.popup.dontask = Hämta hem filer automatiskt i fortsättningen -torbutton.popup.prompted_language = För ett bättre integritetsskydd kan Torbutton begära den engelska versionen av webbsidor. Detta kan göra att webbsidor som du föredrar att läsa på ditt modersmål visas på engelska istället.\\\n\\\n Vill du visa sidor på engelska för att få ett bättre integritetsskydd? +torbutton.popup.prompted_language = För ett bättre integritetsskydd kan Torbutton begära den engelska versionen av webbplatser. Detta kan göra att webbplatser som du föredrar att läsa på ditt modersmål visas på engelska istället.\\\n\\\n Vill du visa sidor på engelska för att få ett bättre integritetsskydd? torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle? torbutton.title.prompt_torbrowser = Viktig information om Torbutton torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: Du kan inte slå av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för icke-Tor surfning. Det var för många buggar som vi inte kunde fixa på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt så bör du avinstallera Tor Browser och ladda ner Tor Browser Bundle. Tor Browser skyddar ditt privatliv bättre än vanliga Firefox, även när Firefox används med Tor Browser.\n\nFör att ta bort Torbutton, gå till Verktyg->Tillägg->Tillägg och klicka på Ta bort-knappen bredvid Torbutton. diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index b153d8f..16bbfda 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -12,7 +12,7 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "点此初始化 Torbutton"> <!ENTITY torbutton.prefs.security_settings "Tor 浏览器安全设置"> -<!ENTITY torbutton.prefs.restore_defaults "恢复默认"> +<!ENTITY torbutton.prefs.restore_defaults "恢复默认设置"> <!ENTITY torbutton.prefs.custom_warning "您自定义的浏览器设置导致了不安全的安全设置。出于安全和隐私考虑，我们建议您选择一个默认的安全级别。"> <!ENTITY torbutton.cookiedialog.title "管理受保护的 Cookie"> <!ENTITY torbutton.cookiedialog.lockCol "受保护"> @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "该选项用于防止滥用浏览器功能跟踪用户。修改的功能包括：blob 网址，广播通道，浏览器缓存，cookie，收藏夹图标，HTTP 验证头部，预连接，localStorage，mediaSource 网址，OCSP 请求，SharedWorker 和 TLS 会话票证。"> <!ENTITY torbutton.prefs.resist_fingerprinting "修改 Tor 浏览器中可区分你与其他 Tor 用户的细节信息"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "选中此框以避免网站获取识别您的指纹，包括您的计算机性能、键盘布局、语言区域、已安装插件位置、已安装插件列表、您的网络状态、屏幕方向、屏幕尺寸、特定网站缩放级别、支持的文件类型、系统颜色、WebGL 能力。"> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "勾选此选项以避免网站获取您的浏览器指纹信息，包括您的计算机性能、键盘布局、系统语言、安装插件的位置、已安装插件列表、您的网络状态、屏幕方向、屏幕尺寸、特定网站缩放级别、支持的文件类型、系统颜色、WebGL 功能。"> <!ENTITY torbutton.prefs.sec_caption "安全等级"> <!ENTITY torbutton.prefs.sec_caption_tooltip "安全滑块可禁用某些浏览器功能，避免因这些功能导致的漏洞而受到攻击。"> <!ENTITY torbutton.prefs.sec_low "低（默认）">

1 0

[torbutton/maint-1.9.7] Update locales with translated banner
by gk＠torproject.org 23 Oct '17

23 Oct '17

commit e8705e5050b061062744569d5ff8efdbb035541e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 23 06:04:39 2017 +0000 Update locales with translated banner --- src/modules/donation-banner.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/modules/donation-banner.js b/src/modules/donation-banner.js index ac397e5..6c205fe 100644 --- a/src/modules/donation-banner.js +++ b/src/modules/donation-banner.js @@ -7,17 +7,15 @@ Cu.import("resource://gre/modules/Services.jsm"); // A list of locales for which the banner has been translated. const kBannerLocales = [ - "bg", - "da", "de", - "el", "en", "es", + "fa", "fr", - "is", "it", + "nl", + "pl", "pt", - "nb", "ru", "sv", "tr",

1 0

[torbutton/maint-1.9.7] Release preparations for 1.9.7.9
by gk＠torproject.org 23 Oct '17

23 Oct '17

commit 262435740fcbdea4d65bbe830f32ca1f8ebdbe99 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 23 06:05:56 2017 +0000 Release preparations for 1.9.7.9 CHANGELOG update, version bump --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index e168ca0..58800ee 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.9.7.9 + * Bug 23949: Fix donation banner display + * Update locales with translated banner + * Translations update + 1.9.7.8 * Bug 23887: Update banner locales and Mozilla text * Bug 23526: Add 2017 Donation banner text diff --git a/src/install.rdf b/src/install.rdf index acbc7e9..763b30d 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.7.8</em:version> + <em:version>1.9.7.9</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[tor-browser/tor-browser-52.4.1esr-7.5-1] Bug 1305396 - Replace memmove with std::copy_backward in a file that doesn't include cstring explicitly. r=keeler
by gk＠torproject.org 20 Oct '17

20 Oct '17

commit e6cd07862cf0de06b9cc7c091f9d2dd32cd76280 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 16 20:03:54 2017 +0200 Bug 1305396 - Replace memmove with std::copy_backward in a file that doesn't include cstring explicitly. r=keeler --- security/pkix/lib/pkixnames.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/security/pkix/lib/pkixnames.cpp b/security/pkix/lib/pkixnames.cpp index ca9b8d7d3770..95aa41382a03 100644 --- a/security/pkix/lib/pkixnames.cpp +++ b/security/pkix/lib/pkixnames.cpp @@ -34,6 +34,8 @@ // constraints, the reference identifier is the entire encoded name constraint // extension value. +#include <algorithm> + #include "pkixcheck.h" #include "pkixutil.h" @@ -1705,11 +1707,9 @@ FinishIPv6Address(/*in/out*/ uint8_t (&address)[16], int numComponents, } // Shift components that occur after the contraction over. - size_t componentsToMove = static_cast<size_t>(numComponents - - contractionIndex); - memmove(address + (2u * static_cast<size_t>(8 - componentsToMove)), - address + (2u * static_cast<size_t>(contractionIndex)), - componentsToMove * 2u); + std::copy_backward(address + (2u * static_cast<size_t>(contractionIndex)), + address + (2u * static_cast<size_t>(numComponents)), + address + (2u * 8u)); // Fill in the contracted area with zeros. std::fill_n(address + 2u * static_cast<size_t>(contractionIndex), (8u - static_cast<size_t>(numComponents)) * 2u, static_cast<uint8_t>(0u));

1 0

[tor-browser-bundle/maint-7.0] Fix 7.0.7 Changelog
by gk＠torproject.org 19 Oct '17

19 Oct '17

commit a4e773e8ae8c405b01e61f0b47fda2ee388a21a4 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 19 05:42:56 2017 +0000 Fix 7.0.7 Changelog --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 6bb4854..b4673a2 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -22,6 +22,8 @@ Tor Browser 7.0.7 -- October 19 2017 * Bug 23694: Update the detailsURL in update responses * OS X * Bug 23807: Tab crashes when playing video on High Sierra + * Linux + * Bug 22692: Enable content sandboxing on Linux Tor Browser 7.0.6 -- September 26 2017 * All Platforms

1 0

[tor-browser-build/master] Release preparations for 7.5a6
by gk＠torproject.org 18 Oct '17

18 Oct '17

commit 9b4ba8252a80fb10ca9fc22e90033d63383ac05d Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 18 06:59:07 2017 +0000 Release preparations for 7.5a6 Changelog update and version bumps --- projects/firefox/config | 4 ++-- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 18 ++++++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 6 +++--- 7 files changed, 28 insertions(+), 10 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 5fe6eb1..85a4f00 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,13 +1,13 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg var: - firefox_platform_version: 52.4.0 + firefox_platform_version: 52.4.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 7.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 0ccd4e1..99290e7 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2017.9.12 +version: 2017.10.4 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 56fcb64..e18d650 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,21 @@ +Tor Browser 7.5a6 -- October 19 2017 + * All Platforms + * Update Firefox to 52.4.1esr + * Update Tor to 0.3.2.2-alpha + * Update Torbutton to 1.9.8.2 + * Bug 23887: Update banner locales and Mozilla text + * Translations update + * Update HTTPS-Everywhere to 2017.10.4 + * Update NoScript to 5.1.2 + * Bug 23723: Loading entities from NoScript .dtd files is blocked + * Bug 23724: NoScript update breaks Security Slider and its icon disappears + * Bug 23745: Tab crashes when using Tor Browser to access Google Drive + * Bug 23694: Update the detailsURL in update responses + * Bug 22501: Requests via javascript: violate FPI + * OS X + * Bug 23807: Tab crashes when playing video on High Sierra + * Bug 23025: Add some hardening flags to macOS build + Tor Browser 7.5a5 -- September 28 2017 * All Platforms * Update Firefox to 52.4.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 5121459..a777a98 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -57,9 +57,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: cfc8018a5ddd2a699581932a9911e28b1060667c7849cf5283b548b5b29a65a2 + sha256sum: 82687646b9ecc39d478ac5d4de035b32fdf88efc6faceec3e74b49c863bbfabb - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus diff --git a/projects/tor/config b/projects/tor/config index 26c3780..b5df573 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.2.1-alpha +version: 0.3.2.2-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index 2cc2288..6e45ef8 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.8.1 +version: 1.9.8.2 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 6b5fc3e..80a7091 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '7.5a5' - torbrowser_build: 'build5' + torbrowser_version: '7.5a6' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 7.5a4 + - 7.5a5 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[torbutton/master] Release preparations for 1.9.8.2
by gk＠torproject.org 18 Oct '17

18 Oct '17

commit ba26f41e78319a3d412d59c58c9f701525e3fbfc Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 18 06:45:19 2017 +0000 Release preparations for 1.9.8.2 CHANGELOG update and version bump --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 6d6c973..0eb1e0e 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.9.8.2 + * Bug 23887: Update banner locales and Mozilla text + * Translations update + 1.9.8.1 * Bug 20375: Warn users after entering fullscreen mode * Bug 22989: Fix dimensions of new windows on macOS diff --git a/src/install.rdf b/src/install.rdf index 57387d2..30f2ddd 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.8.1</em:version> + <em:version>1.9.8.2</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[tor-browser-build/master] Bug 23025: Add some hardening flags to macOS build
by gk＠torproject.org 18 Oct '17

18 Oct '17

commit 6d0193cd71a4969207d7813029722c48a64bb7de Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Oct 2 10:17:52 2017 -0700 Bug 23025: Add some hardening flags to macOS build Added flags: -fstack-protector-strong -D_FORTIFY_SOURCE=2 -Werror=format -Werror=format-security --- projects/firefox/mozconfig-osx-x86_64 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index bc7a30e..9ac3ac8 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -5,7 +5,8 @@ TOOLCHAIN_DIR=/var/tmp/dist/macosx-toolchain CROSS_CCTOOLS_PATH=$TOOLCHAIN_DIR/cctools CROSS_SYSROOT=$TOOLCHAIN_DIR/SDK CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks -FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" +HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" +FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" export CC="$TOOLCHAIN_DIR/clang/bin/clang $FLAGS" export CXX="$TOOLCHAIN_DIR/clang/bin/clang++ $FLAGS"

1 0

[tor-browser/tor-browser-52.4.0esr-7.5-1] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 18 Oct '17

18 Oct '17

commit cf8aaea952b4e83eead22b78a5221ff5783d8fab Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 18 06:29:44 2017 +0000 squash! TB3: Tor Browser's official .mozconfigs. Bug 23025: Add hardening flags for macOS --- .mozconfig-mac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mozconfig-mac b/.mozconfig-mac index 844ee2e94fbc..4e4741243288 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -4,7 +4,8 @@ mk_add_options "export LD_LIBRARY_PATH=$topsrcdir/clang/lib" CROSS_CCTOOLS_PATH=$topsrcdir/cctools CROSS_SYSROOT=$topsrcdir/MacOSX10.7.sdk CROSS_PRIVATE_FRAMEWORKS=$CROSS_SYSROOT/System/Library/PrivateFrameworks -FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT" +HARDENING_FLAGS="-Werror=format -Werror=format-security -fstack-protector-strong -D_FORTIFY_SOURCE=2" +FLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $CROSS_CCTOOLS_PATH/bin -isysroot $CROSS_SYSROOT $HARDENING_FLAGS" export CC="$topsrcdir/clang/bin/clang $FLAGS" export CXX="$topsrcdir/clang/bin/clang++ $FLAGS"

1 0

[tor-browser-build/master] Bug 23812: fix parsing of runc spec version
by gk＠torproject.org 18 Oct '17

18 Oct '17

commit bfdc5bc5aecceb8ec713562f36134e6ec64cc845 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 11 00:53:00 2017 +0200 Bug 23812: fix parsing of runc spec version --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index c433f00..6b5fc3e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -383,7 +383,7 @@ ENV: # We will need to update this when there is a new spec version available runc_spec100 => sub { my ($out) = capture_exec('sudo', 'runc', '--version'); - return $out =~ m/^runc version spec: 1\.0\.0$/; + return $out =~ m/^spec: 1\.0\.0$/m; }, }, )

1 0

[tor-browser-build/master] Bug 23694: update the detailsURL in update responses
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit ac2aeae99060dde267e89e68f6962047a89ddf80 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Oct 17 15:59:13 2017 +0200 Bug 23694: update the detailsURL in update responses --- projects/release/update_responses_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/update_responses_config.yml b/projects/release/update_responses_config.yml index f0d9dbf..69d8909 100644 --- a/projects/release/update_responses_config.yml +++ b/projects/release/update_responses_config.yml @@ -23,7 +23,7 @@ channels: versions: [% c("var/torbrowser_version") %]: platformVersion: [% pc('firefox', 'var/firefox_platform_version') %] - detailsURL: https://blog.torproject.org/blog/tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %]-released + detailsURL: https://blog.torproject.org/tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %]-released incremental_from: [% FOREACH v IN c("var/torbrowser_incremental_from") -%] - [% v %]

1 0

[tor-browser-bundle/maint-7.0] Bug 23694: update the detailsURL in update responses
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 4082cf0318557c0a4d7d161c88e15ffd9118133c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 17 14:08:56 2017 +0000 Bug 23694: update the detailsURL in update responses Patch by boklm --- tools/update-responses/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 0275d31..1eceba9 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -24,7 +24,7 @@ channels: versions: 7.0.7: platformVersion: 52.4.1 - detailsURL: https://blog.torproject.org/blog/tor-browser-707-released + detailsURL: https://blog.torproject.org/tor-browser-707-released incremental_from: - 7.0.6 migrate_archs:

1 0

[tor-browser-bundle/maint-7.0] Update Changelog file
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit ef1896ec8904a012321f7da74e249913c9e1260f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 17 14:12:47 2017 +0000 Update Changelog file --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c35d20d..6bb4854 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -19,6 +19,7 @@ Tor Browser 7.0.7 -- October 19 2017 * Bug 22472: Fix FTP downloads when external helper app dialog is shown * Bug 22471: Downloading pdf files via the PDF viewer download button is broken * Bug 22618: Downloading pdf file via file:/// is stalling + * Bug 23694: Update the detailsURL in update responses * OS X * Bug 23807: Tab crashes when playing video on High Sierra

1 0

[tor-browser-bundle/maint-7.0] Release preprations for 7.0.7
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 8aae9b4a45b707c04aba4a1dcc08e3dcf7793bbe Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 17 14:05:27 2017 +0000 Release preprations for 7.0.7 Changelog update, version bumps, and update of config.yml --- Bundle-Data/Docs/ChangeLog.txt | 24 ++++++++++++++++++++++++ gitian/versions | 10 +++++----- tools/update-responses/config.yml | 10 +++++----- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 310cdf0..c35d20d 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,27 @@ +Tor Browser 7.0.7 -- October 19 2017 + * All Platforms + * Update Firefox to 52.4.1esr + * Update Torbutton to 1.9.7.8 + * Bug 23887: Update banner locales and Mozilla text + * Bug 23526: Add 2017 Donation banner text + * Bug 23483: Donation banner on about:tor for 2017 (testing mode) + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Translations update + * Update HTTPS-Everywhere to 2017.10.4 + * Update NoScript to 5.1.2 + * Bug 23723: Loading entities from NoScript .dtd files is blocked + * Bug 23724: NoScript update breaks Security Slider and its icon disappears + * Bug 23745: Tab crashes when using Tor Browser to access Google Drive + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * OS X + * Bug 23807: Tab crashes when playing video on High Sierra + Tor Browser 7.0.6 -- September 26 2017 * All Platforms * Update Firefox to 52.4.0esr diff --git a/gitian/versions b/gitian/versions index 368fb98..e5e9ade 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1 VERIFY_TAGS=1 -FIREFOX_VERSION=52.4.0esr +FIREFOX_VERSION=52.4.1esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1 TOR_TAG=tor-0.3.1.7 TORLAUNCHER_TAG=0.2.12.3 -TORBUTTON_TAG=1.9.7.7 -HTTPSE_TAG=2017.9.12 +TORBUTTON_TAG=1.9.7.8 +HTTPSE_TAG=2017.10.4 NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable @@ -67,7 +67,7 @@ YASM_VER=1.2.0 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-5.0.10-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-5.1.2-fx+sm.xpi CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz MSVCR100_PACKAGE=msvcr100.dll @@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf -NOSCRIPT_HASH=cfc8018a5ddd2a699581932a9911e28b1060667c7849cf5283b548b5b29a65a2 +NOSCRIPT_HASH=82687646b9ecc39d478ac5d4de035b32fdf88efc6faceec3e74b49c863bbfabb CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 9838c8a..0275d31 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -20,13 +20,13 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 7.0a4 - release: 7.0.6 + release: 7.0.7 versions: - 7.0.6: - platformVersion: 52.4.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-706-released + 7.0.7: + platformVersion: 52.4.1 + detailsURL: https://blog.torproject.org/blog/tor-browser-707-released incremental_from: - - 7.0.5 + - 7.0.6 migrate_archs: osx32: osx64 migrate_langs:

1 0

[torbutton/maint-1.9.7] Release preparations for 1.9.7.8
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 6204ab402535409a0ddaba41796416fe2103b67f Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 17 13:30:36 2017 +0000 Release preparations for 1.9.7.8 CHANGELOG update and version bump --- src/CHANGELOG | 10 ++++++++++ src/install.rdf | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 35f198c..e168ca0 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,13 @@ +1.9.7.8 + * Bug 23887: Update banner locales and Mozilla text + * Bug 23526: Add 2017 Donation banner text + * Bug 23483: Donation banner on about:tor for 2017 (testing mode) + * Bug 22610: Avoid crashes when canceling external helper app related downloads + * Bug 22472: Fix FTP downloads when external helper app dialog is shown + * Bug 22471: Downloading pdf files via the PDF viewer download button is broken + * Bug 22618: Downloading pdf file via file:/// is stalling + * Translations update + 1.9.7.7 * Bug 22542: Security Settings window too small on macOS 10.12 (fixup) * Bug 20375: Warn users after entering fullscreen mode diff --git a/src/install.rdf b/src/install.rdf index 97cdfd7..acbc7e9 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.9.7.7</em:version> + <em:version>1.9.7.8</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Revert "Bug 21308: Set indexedDB->null when dom.indexeddb.enabled=false"
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit d3222cf5469b28bfb2b018055693d94254df9cd2 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 17 00:08:10 2017 -0700 Revert "Bug 21308: Set indexedDB->null when dom.indexeddb.enabled=false" This reverts commit 31348e47a340494c4002b43d8fb509689f8f7e63. --- dom/indexedDB/IDBFactory.cpp | 4 ++-- dom/indexedDB/test/mochitest.ini | 1 - dom/indexedDB/test/test_disable_indexeddb.html | 28 -------------------------- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp index be17108057f9..1aeff8d1ebc4 100644 --- a/dom/indexedDB/IDBFactory.cpp +++ b/dom/indexedDB/IDBFactory.cpp @@ -133,7 +133,7 @@ IDBFactory::CreateForWindow(nsPIDOMWindowInner* aWindow, if (!(NS_SUCCEEDED(rv) && nsContentUtils::IsSystemPrincipal(principal)) && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; - return NS_OK; + return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; } if (rv == NS_ERROR_DOM_NOT_SUPPORTED_ERR) { @@ -249,7 +249,7 @@ IDBFactory::CreateForMainThreadJSInternal( if (aPrincipalInfo->type() != PrincipalInfo::TSystemPrincipalInfo && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; - return NS_OK; + return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; } IndexedDatabaseManager* mgr = IndexedDatabaseManager::GetOrCreate(); diff --git a/dom/indexedDB/test/mochitest.ini b/dom/indexedDB/test/mochitest.ini index a4473b26839c..4ab55a9dc2b3 100644 --- a/dom/indexedDB/test/mochitest.ini +++ b/dom/indexedDB/test/mochitest.ini @@ -159,7 +159,6 @@ skip-if = e10s [test_deleteDatabase_interactions.html] [test_deleteDatabase_onblocked.html] [test_deleteDatabase_onblocked_duringVersionChange.html] -[test_disable_indexeddb.html] [test_error_events_abort_transactions.html] [test_event_propagation.html] [test_event_source.html] diff --git a/dom/indexedDB/test/test_disable_indexeddb.html b/dom/indexedDB/test/test_disable_indexeddb.html deleted file mode 100644 index d8a691f9be18..000000000000 --- a/dom/indexedDB/test/test_disable_indexeddb.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html> -<html> -<head> - <title>Indexed Database Disable Pref test</title> - - <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> - <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> - <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> - -</head> - -<body> - <script> - add_task(function* () { - for (let enable of [false, true]) { - yield SpecialPowers.pushPrefEnv( - {'set': [['dom.indexedDB.enabled', enable]]}); - if (!enable) { - is(indexedDB, null, "indexedDB should be null"); - } else { - isnot(indexedDB, null, "indexedDB should be non-null"); - } - } - }); - </script> -</body> - -</html>

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 00c8f9b86215e26a2a9785be4a45e8a2d652e224 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 17 00:10:37 2017 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 23745: Set dom.indexedDB.enabled = true --- browser/app/profile/000-tor-browser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 16c23be0d65a..a1e66a80e73f 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -46,7 +46,6 @@ pref("browser.disableResetPrompt", true); pref("browser.privatebrowsing.autostart", true); pref("browser.cache.disk.enable", false); pref("browser.cache.offline.enable", false); -pref("dom.indexedDB.enabled", false); pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); pref("browser.download.manager.retention", 1);

1 0

[tor-browser/tor-browser-52.4.0esr-7.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit b4fc15a8986a8d2c8267df281b526eafb58bf6d7 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 17 00:10:37 2017 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 23745: Set dom.indexedDB.enabled = true --- browser/app/profile/000-tor-browser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 444c9f39b02a..32922418b12f 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -46,7 +46,6 @@ pref("browser.disableResetPrompt", true); pref("browser.privatebrowsing.autostart", true); pref("browser.cache.disk.enable", false); pref("browser.cache.offline.enable", false); -pref("dom.indexedDB.enabled", false); pref("permissions.memory_only", true); pref("network.cookie.lifetimePolicy", 2); pref("browser.download.manager.retention", 1);

1 0

[tor-browser/tor-browser-52.4.0esr-7.5-1] Revert "Bug 21308: Set indexedDB->null when dom.indexeddb.enabled=false"
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 03d6c603319adbf80c6a9badc0922fd339fb80cc Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Oct 17 00:08:10 2017 -0700 Revert "Bug 21308: Set indexedDB->null when dom.indexeddb.enabled=false" This reverts commit 31348e47a340494c4002b43d8fb509689f8f7e63. --- dom/indexedDB/IDBFactory.cpp | 4 ++-- dom/indexedDB/test/mochitest.ini | 1 - dom/indexedDB/test/test_disable_indexeddb.html | 28 -------------------------- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp index be17108057f9..1aeff8d1ebc4 100644 --- a/dom/indexedDB/IDBFactory.cpp +++ b/dom/indexedDB/IDBFactory.cpp @@ -133,7 +133,7 @@ IDBFactory::CreateForWindow(nsPIDOMWindowInner* aWindow, if (!(NS_SUCCEEDED(rv) && nsContentUtils::IsSystemPrincipal(principal)) && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; - return NS_OK; + return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; } if (rv == NS_ERROR_DOM_NOT_SUPPORTED_ERR) { @@ -249,7 +249,7 @@ IDBFactory::CreateForMainThreadJSInternal( if (aPrincipalInfo->type() != PrincipalInfo::TSystemPrincipalInfo && NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) { *aFactory = nullptr; - return NS_OK; + return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR; } IndexedDatabaseManager* mgr = IndexedDatabaseManager::GetOrCreate(); diff --git a/dom/indexedDB/test/mochitest.ini b/dom/indexedDB/test/mochitest.ini index a4473b26839c..4ab55a9dc2b3 100644 --- a/dom/indexedDB/test/mochitest.ini +++ b/dom/indexedDB/test/mochitest.ini @@ -159,7 +159,6 @@ skip-if = e10s [test_deleteDatabase_interactions.html] [test_deleteDatabase_onblocked.html] [test_deleteDatabase_onblocked_duringVersionChange.html] -[test_disable_indexeddb.html] [test_error_events_abort_transactions.html] [test_event_propagation.html] [test_event_source.html] diff --git a/dom/indexedDB/test/test_disable_indexeddb.html b/dom/indexedDB/test/test_disable_indexeddb.html deleted file mode 100644 index d8a691f9be18..000000000000 --- a/dom/indexedDB/test/test_disable_indexeddb.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html> -<html> -<head> - <title>Indexed Database Disable Pref test</title> - - <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> - <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> - <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/> - -</head> - -<body> - <script> - add_task(function* () { - for (let enable of [false, true]) { - yield SpecialPowers.pushPrefEnv( - {'set': [['dom.indexedDB.enabled', enable]]}); - if (!enable) { - is(indexedDB, null, "indexedDB should be null"); - } else { - isnot(indexedDB, null, "indexedDB should be non-null"); - } - } - }); - </script> -</body> - -</html>

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit bad2f0be0d196bf51fb69d8e26147b3df5733a13 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jun 28 15:13:05 2016 -0400 Bug 19273: Avoid JavaScript patching of the external app helper dialog. When handling an external URI or downloading a file, invoke Torbutton's external app blocker component (which will present a download warning dialog unless the user has checked the "Automatically download files from now on" box). For e10s compatibility, avoid using a modal dialog and instead use a callback interface (nsIHelperAppWarningLauncher) to allow Torbutton to indicate the user's desire to cancel or continue each request. Other bugs fixed: Bug 21766: Crash with e10s enabled while trying to download a file Bug 21886: Download is stalled in non-e10s mode Bug 22471: Downloading files via the PDF viewer download button is broken Bug 22472: Fix FTP downloads when external helper app dialog is shown Bug 22610: Avoid crashes when canceling external helper app downloads Bug 22618: Downloading pdf file via file:/// is stalling --- netwerk/protocol/http/HttpBaseChannel.cpp | 7 + netwerk/protocol/http/HttpBaseChannel.h | 1 + netwerk/protocol/http/NullHttpChannel.cpp | 6 + netwerk/protocol/http/nsIHttpChannel.idl | 9 +- .../protocol/viewsource/nsViewSourceChannel.cpp | 11 ++ .../exthandler/nsExternalHelperAppService.cpp | 219 +++++++++++++++++++-- uriloader/exthandler/nsExternalHelperAppService.h | 3 + .../exthandler/nsIExternalHelperAppService.idl | 47 +++++ 8 files changed, 285 insertions(+), 18 deletions(-) diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index e0f7edec05f9..5ea6a002a40f 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -1233,6 +1233,13 @@ NS_IMETHODIMP HttpBaseChannel::SetTopLevelContentWindowId(uint64_t aWindowId) return NS_OK; } +NS_IMETHODIMP HttpBaseChannel::IsPendingUnforced(bool *aIsPendingUnforced) +{ + NS_ENSURE_ARG_POINTER(aIsPendingUnforced); + *aIsPendingUnforced = mIsPending; + return NS_OK; +} + NS_IMETHODIMP HttpBaseChannel::GetTransferSize(uint64_t *aTransferSize) { diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h index c8184a601b9e..3a1a8ba525b0 100644 --- a/netwerk/protocol/http/HttpBaseChannel.h +++ b/netwerk/protocol/http/HttpBaseChannel.h @@ -190,6 +190,7 @@ public: NS_IMETHOD SetChannelId(const nsACString& aChannelId) override; NS_IMETHOD GetTopLevelContentWindowId(uint64_t *aContentWindowId) override; NS_IMETHOD SetTopLevelContentWindowId(uint64_t aContentWindowId) override; + NS_IMETHOD IsPendingUnforced(bool *aIsPendingUnforced) override; // nsIHttpChannelInternal NS_IMETHOD GetDocumentURI(nsIURI **aDocumentURI) override; diff --git a/netwerk/protocol/http/NullHttpChannel.cpp b/netwerk/protocol/http/NullHttpChannel.cpp index 8c048a6b5a7e..8b362cb24233 100644 --- a/netwerk/protocol/http/NullHttpChannel.cpp +++ b/netwerk/protocol/http/NullHttpChannel.cpp @@ -82,6 +82,12 @@ NullHttpChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP +NullHttpChannel::IsPendingUnforced(bool *_retval) +{ + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP NullHttpChannel::GetTransferSize(uint64_t *aTransferSize) { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/netwerk/protocol/http/nsIHttpChannel.idl b/netwerk/protocol/http/nsIHttpChannel.idl index 75ec2c73989a..0de0676ad156 100644 --- a/netwerk/protocol/http/nsIHttpChannel.idl +++ b/netwerk/protocol/http/nsIHttpChannel.idl @@ -14,7 +14,7 @@ interface nsIHttpHeaderVisitor; * the inspection of the resulting HTTP response status and headers when they * become available. */ -[builtinclass, scriptable, uuid(c5a4a073-4539-49c7-a3f2-cec3f0619c6c)] +[builtinclass, scriptable, uuid(e0d8071b-5389-48c2-92c7-6708c968044d)] interface nsIHttpChannel : nsIChannel { /************************************************************************** @@ -469,4 +469,11 @@ interface nsIHttpChannel : nsIChannel * this channels is being load in. */ attribute uint64_t topLevelContentWindowId; + + /** + * Returns true if a request is pending due to "natural" causes and + * not just because ForcePending() has been called. See isPending() + * in nsIRequest.idl for more details about pending requests. + */ + boolean isPendingUnforced(); }; diff --git a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp index 9ed71c4ef001..9f9b89438fba 100644 --- a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp +++ b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp @@ -740,6 +740,17 @@ nsViewSourceChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP +nsViewSourceChannel::IsPendingUnforced(bool *result) +{ + if (mHttpChannel) { + return mHttpChannel->IsPendingUnforced(result); + } + + NS_ENSURE_TRUE(mChannel, NS_ERROR_FAILURE); + return mChannel->IsPending(result); +} + +NS_IMETHODIMP nsViewSourceChannel::GetRequestMethod(nsACString & aRequestMethod) { return !mHttpChannel ? NS_ERROR_NULL_POINTER : diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 51a7ee0f6ab6..7d2dad321b6c 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -41,6 +41,7 @@ #include "nsThreadUtils.h" #include "nsAutoPtr.h" #include "nsIMutableArray.h" +#include "nsISupportsPrimitives.h" // for nsISupportsPRBool // used to access our datastore of user-configured helper applications #include "nsIHandlerService.h" @@ -105,6 +106,7 @@ #include "mozilla/Preferences.h" #include "mozilla/ipc/URIUtils.h" +#include "mozilla/Unused.h" using namespace mozilla; using namespace mozilla::ipc; @@ -132,6 +134,9 @@ static const char NEVER_ASK_FOR_SAVE_TO_DISK_PREF[] = static const char NEVER_ASK_FOR_OPEN_FILE_PREF[] = "browser.helperApps.neverAsk.openFile"; +static const char WARNING_DIALOG_CONTRACT_ID[] = + "@torproject.org/torbutton-extAppBlocker;1"; + // Helper functions for Content-Disposition headers /** @@ -434,6 +439,22 @@ static nsresult GetDownloadDirectory(nsIFile **_directory, return NS_OK; } +static nsresult shouldCancel(bool *aShouldCancel) +{ + NS_ENSURE_ARG_POINTER(aShouldCancel); + + nsCOMPtr<nsISupportsPRBool> cancelObj = + do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID); + cancelObj->SetData(false); + nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService(); + if (!obs) + return NS_ERROR_FAILURE; + + obs->NotifyObservers(cancelObj, "external-app-requested", nullptr); + cancelObj->GetData(aShouldCancel); + return NS_OK; +} + /** * Structure for storing extension->type mappings. * @see defaultMimeEntries @@ -594,6 +615,107 @@ static const nsDefaultMimeTypeEntry nonDecodableExtensions[] = { { APPLICATION_GZIP, "svgz" } }; +////////////////////////////////////////////////////////////////////////////////////////////////////// +// begin nsExternalLoadURIHandler class definition and implementation +////////////////////////////////////////////////////////////////////////////////////////////////////// +class nsExternalLoadURIHandler final : public nsIHelperAppWarningLauncher +{ +public: + NS_DECL_THREADSAFE_ISUPPORTS + NS_DECL_NSIHELPERAPPWARNINGLAUNCHER + + nsExternalLoadURIHandler(nsIInterfaceRequestor *aWindowContext, + nsIURI *aURI, + nsIHandlerInfo *aHandlerInfo); + +protected: + ~nsExternalLoadURIHandler(); + + nsCOMPtr<nsIInterfaceRequestor> mWindowContext; + nsCOMPtr<nsIURI> mURI; + nsCOMPtr<nsIHandlerInfo> mHandlerInfo; + nsCOMPtr<nsIHelperAppWarningDialog> mWarningDialog; +}; + +NS_IMPL_ADDREF(nsExternalLoadURIHandler) +NS_IMPL_RELEASE(nsExternalLoadURIHandler) + +NS_INTERFACE_MAP_BEGIN(nsExternalLoadURIHandler) + NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIHelperAppWarningLauncher) + NS_INTERFACE_MAP_ENTRY(nsIHelperAppWarningLauncher) +NS_INTERFACE_MAP_END_THREADSAFE + +nsExternalLoadURIHandler::nsExternalLoadURIHandler( + nsIInterfaceRequestor *aWindowContext, + nsIURI *aURI, + nsIHandlerInfo *aHandlerInfo) +: mWindowContext(aWindowContext) +, mURI(aURI) +, mHandlerInfo(aHandlerInfo) +{ + nsresult rv = NS_OK; + mWarningDialog = do_CreateInstance(WARNING_DIALOG_CONTRACT_ID, &rv); + if (NS_SUCCEEDED(rv) && mWarningDialog) { + // This will create a reference cycle (the dialog holds a reference to us + // as nsIHelperAppWarningLauncher), which will be broken in ContinueRequest + // or CancelRequest. + rv = mWarningDialog->MaybeShow(this, aWindowContext); + } + + if (NS_FAILED(rv)) { + // If for some reason we could not open the download warning prompt, + // continue with the request. + ContinueRequest(); + } +} + +nsExternalLoadURIHandler::~nsExternalLoadURIHandler() +{ +} + +NS_IMETHODIMP nsExternalLoadURIHandler::ContinueRequest() +{ + MOZ_ASSERT(mURI); + MOZ_ASSERT(mHandlerInfo); + + // Break our reference cycle with the download warning dialog (set up in + // LoadURI). + mWarningDialog = nullptr; + + nsHandlerInfoAction preferredAction; + mHandlerInfo->GetPreferredAction(&preferredAction); + bool alwaysAsk = true; + mHandlerInfo->GetAlwaysAskBeforeHandling(&alwaysAsk); + + // If we are not supposed to ask, and the preferred action is to use + // a helper app or the system default, we just launch the URI. + if (!alwaysAsk && (preferredAction == nsIHandlerInfo::useHelperApp || + preferredAction == nsIHandlerInfo::useSystemDefault)) + return mHandlerInfo->LaunchWithURI(mURI, mWindowContext); + + nsresult rv = NS_OK; + nsCOMPtr<nsIContentDispatchChooser> chooser = + do_CreateInstance("@mozilla.org/content-dispatch-chooser;1", &rv); + NS_ENSURE_SUCCESS(rv, rv); + + return chooser->Ask(mHandlerInfo, mWindowContext, mURI, + nsIContentDispatchChooser::REASON_CANNOT_HANDLE); +} + +NS_IMETHODIMP nsExternalLoadURIHandler::CancelRequest(nsresult aReason) +{ + NS_ENSURE_ARG(NS_FAILED(aReason)); + + // Break our reference cycle with the download warning dialog (set up in + // LoadURI). + mWarningDialog = nullptr; + + return NS_OK; +} + +////////////////////////////////////////////////////////////////////////////////////////////////////// +// nsExternalHelperAppService definition and implementation +////////////////////////////////////////////////////////////////////////////////////////////////////// NS_IMPL_ISUPPORTS( nsExternalHelperAppService, nsIExternalHelperAppService, @@ -1010,27 +1132,25 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI, return NS_OK; // explicitly denied } + // Give other modules, including extensions, a chance to cancel. + bool doCancel = false; + rv = shouldCancel(&doCancel); + NS_ENSURE_SUCCESS(rv, rv); + if (doCancel) { + return NS_OK; + } + nsCOMPtr<nsIHandlerInfo> handler; rv = GetProtocolHandlerInfo(scheme, getter_AddRefs(handler)); NS_ENSURE_SUCCESS(rv, rv); - nsHandlerInfoAction preferredAction; - handler->GetPreferredAction(&preferredAction); - bool alwaysAsk = true; - handler->GetAlwaysAskBeforeHandling(&alwaysAsk); + RefPtr<nsExternalLoadURIHandler> h = + new nsExternalLoadURIHandler(aWindowContext, uri, handler); + if (!h) { + return NS_ERROR_OUT_OF_MEMORY; + } - // if we are not supposed to ask, and the preferred action is to use - // a helper app or the system default, we just launch the URI. - if (!alwaysAsk && (preferredAction == nsIHandlerInfo::useHelperApp || - preferredAction == nsIHandlerInfo::useSystemDefault)) - return handler->LaunchWithURI(uri, aWindowContext); - - nsCOMPtr<nsIContentDispatchChooser> chooser = - do_CreateInstance("@mozilla.org/content-dispatch-chooser;1", &rv); - NS_ENSURE_SUCCESS(rv, rv); - - return chooser->Ask(handler, aWindowContext, uri, - nsIContentDispatchChooser::REASON_CANNOT_HANDLE); + return NS_OK; } NS_IMETHODIMP nsExternalHelperAppService::GetApplicationDescription(const nsACString& aScheme, nsAString& _retval) @@ -1198,6 +1318,7 @@ NS_INTERFACE_MAP_BEGIN(nsExternalAppHandler) NS_INTERFACE_MAP_ENTRY(nsIStreamListener) NS_INTERFACE_MAP_ENTRY(nsIRequestObserver) NS_INTERFACE_MAP_ENTRY(nsIHelperAppLauncher) + NS_INTERFACE_MAP_ENTRY(nsIHelperAppWarningLauncher) NS_INTERFACE_MAP_ENTRY(nsICancelable) NS_INTERFACE_MAP_ENTRY(nsITimerCallback) NS_INTERFACE_MAP_ENTRY(nsIBackgroundFileSaverObserver) @@ -1643,6 +1764,37 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo return NS_OK; } + // Give other modules, including extensions, a chance to cancel. + // To avoid a problem where OnDataAvailable fires but is not handled + // correctly while a modal dialog displayed by Torbutton is open, we + // suspend and then we either cancel or resume active requests. + // See bugs 21766 and 21886. + bool isPending = false; + nsCOMPtr<nsIHttpChannel> httpChan = do_QueryInterface(request); + if (httpChan) { + rv = httpChan->IsPendingUnforced(&isPending); + } else { + rv = request->IsPending(&isPending); + } + NS_ENSURE_SUCCESS(rv, rv); + + if (isPending) { + Unused << request->Suspend(); // Best effort: ignore failures. + } + + bool doCancel = false; + rv = shouldCancel(&doCancel); + NS_ENSURE_SUCCESS(rv, rv); + if (doCancel) { + mCanceled = true; + request->Cancel(NS_BINDING_ABORTED); + return NS_OK; + } + + if (isPending) { + Unused << request->Resume(); // Best effort: ignore failures. + } + rv = SetUpTempFile(aChannel); if (NS_FAILED(rv)) { nsresult transferError = rv; @@ -1671,6 +1823,29 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo httpInternal->SetChannelIsForDownload(true); } + mWarningDialog = do_CreateInstance(WARNING_DIALOG_CONTRACT_ID, &rv); + if (NS_SUCCEEDED(rv) && mWarningDialog) { + // This will create a reference cycle (the dialog holds a reference to us + // as nsIHelperAppWarningLauncher), which will be broken in ContinueRequest + // or CancelRequest. + rv = mWarningDialog->MaybeShow(this, GetDialogParent()); + } + + if (NS_FAILED(rv)) { + // If for some reason we could not open the download warning prompt, + // continue with the request. + ContinueRequest(); + } + + return NS_OK; +} + +NS_IMETHODIMP nsExternalAppHandler::ContinueRequest() +{ + // Break our reference cycle with the download warning dialog (set up in + // OnStartRequest). + mWarningDialog = nullptr; + // now that the temp file is set up, find out if we need to invoke a dialog // asking the user what they want us to do with this content... @@ -1731,6 +1906,7 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo action = nsIMIMEInfo::saveToDisk; } + nsresult rv = NS_OK; if (alwaysAsk) { // Display the dialog @@ -1786,6 +1962,15 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo return NS_OK; } +NS_IMETHODIMP nsExternalAppHandler::CancelRequest(nsresult aReason) +{ + // Break our reference cycle with the download warning dialog (set up in + // OnStartRequest). + mWarningDialog = nullptr; + + return Cancel(aReason); +} + // Convert error info into proper message text and send OnStatusChange // notification to the dialog progress listener or nsITransfer implementation. void nsExternalAppHandler::SendStatusChange(ErrorType type, nsresult rv, nsIRequest *aRequest, const nsAFlatString &path) @@ -2477,7 +2662,7 @@ NS_IMETHODIMP nsExternalAppHandler::Cancel(nsresult aReason) } // Break our reference cycle with the helper app dialog (set up in - // OnStartRequest) + // ContinueRequest) mDialog = nullptr; mRequest = nullptr; diff --git a/uriloader/exthandler/nsExternalHelperAppService.h b/uriloader/exthandler/nsExternalHelperAppService.h index ceec66661dd4..3146407dcbe5 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.h +++ b/uriloader/exthandler/nsExternalHelperAppService.h @@ -210,6 +210,7 @@ private: */ class nsExternalAppHandler final : public nsIStreamListener, public nsIHelperAppLauncher, + public nsIHelperAppWarningLauncher, public nsITimerCallback, public nsIBackgroundFileSaverObserver { @@ -218,6 +219,7 @@ public: NS_DECL_NSISTREAMLISTENER NS_DECL_NSIREQUESTOBSERVER NS_DECL_NSIHELPERAPPLAUNCHER + NS_DECL_NSIHELPERAPPWARNINGLAUNCHER NS_DECL_NSICANCELABLE NS_DECL_NSITIMERCALLBACK NS_DECL_NSIBACKGROUNDFILESAVEROBSERVER @@ -478,6 +480,7 @@ protected: nsCOMPtr<nsIChannel> mOriginalChannel; /**< in the case of a redirect, this will be the pre-redirect channel. */ nsCOMPtr<nsIHelperAppLauncherDialog> mDialog; + nsCOMPtr<nsIHelperAppWarningDialog> mWarningDialog; /** * Keep request alive in case when helper non-modal dialog shown. diff --git a/uriloader/exthandler/nsIExternalHelperAppService.idl b/uriloader/exthandler/nsIExternalHelperAppService.idl index bfdfff5ceaa8..546252f04ba3 100644 --- a/uriloader/exthandler/nsIExternalHelperAppService.idl +++ b/uriloader/exthandler/nsIExternalHelperAppService.idl @@ -152,3 +152,50 @@ interface nsIHelperAppLauncher : nsICancelable */ readonly attribute int64_t contentLength; }; + +/** + * nsIHelperAppWarningLauncher is implemented by two classes: + * nsExternalLoadURIHandler + * nsExternalAppHandler + */ +[scriptable, uuid(cffd508b-4aaf-43ad-99c6-671d35cbc558)] +interface nsIHelperAppWarningLauncher : nsISupports +{ + /** + * Callback invoked by the external app warning dialog to continue the + * request. + * NOTE: This will release the reference to the nsIHelperAppWarningDialog. + */ + void continueRequest(); + + /** + * Callback invoked by the external app warning dialog to cancel the request. + * NOTE: This will release the reference to the nsIHelperAppWarningDialog. + * + * @param aReason + * Pass a failure code to indicate the reason why this operation is + * being canceled. It is an error to pass a success code. + */ + void cancelRequest(in nsresult aReason); +}; + +/** + * nsIHelperAppWarningDialog is implemented by Torbutton's external app + * blocker (src/components/external-app-blocker.js). + */ +[scriptable, uuid(f4899a3f-0df3-42cc-9db8-bdf599e5a208)] +interface nsIHelperAppWarningDialog : nsISupports +{ + /** + * Possibly show a launch warning dialog (it will not be shown if the user + * has chosen to not see the warning again). + * + * @param aLauncher + * A nsIHelperAppWarningLauncher to be invoked after the user confirms + * or cancels the download. + * @param aWindowContext + * The window associated with the download. + */ + void maybeShow(in nsIHelperAppWarningLauncher aLauncher, + in nsISupports aWindowContext); +};

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog."
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit d47e339ca3509f387ee1e4dcc931c6c92c732e98 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 17 12:21:27 2017 +0000 Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog." This reverts commit 9f908d7923d73c525d03b1e58b3b4d6442fb5893. --- netwerk/protocol/http/HttpBaseChannel.cpp | 7 --- netwerk/protocol/http/HttpBaseChannel.h | 1 - netwerk/protocol/http/NullHttpChannel.cpp | 6 --- netwerk/protocol/http/nsIHttpChannel.idl | 9 +--- .../protocol/viewsource/nsViewSourceChannel.cpp | 11 ----- .../exthandler/nsExternalHelperAppService.cpp | 57 ---------------------- 6 files changed, 1 insertion(+), 90 deletions(-) diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 5ea6a002a40f..e0f7edec05f9 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -1233,13 +1233,6 @@ NS_IMETHODIMP HttpBaseChannel::SetTopLevelContentWindowId(uint64_t aWindowId) return NS_OK; } -NS_IMETHODIMP HttpBaseChannel::IsPendingUnforced(bool *aIsPendingUnforced) -{ - NS_ENSURE_ARG_POINTER(aIsPendingUnforced); - *aIsPendingUnforced = mIsPending; - return NS_OK; -} - NS_IMETHODIMP HttpBaseChannel::GetTransferSize(uint64_t *aTransferSize) { diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h index 3a1a8ba525b0..c8184a601b9e 100644 --- a/netwerk/protocol/http/HttpBaseChannel.h +++ b/netwerk/protocol/http/HttpBaseChannel.h @@ -190,7 +190,6 @@ public: NS_IMETHOD SetChannelId(const nsACString& aChannelId) override; NS_IMETHOD GetTopLevelContentWindowId(uint64_t *aContentWindowId) override; NS_IMETHOD SetTopLevelContentWindowId(uint64_t aContentWindowId) override; - NS_IMETHOD IsPendingUnforced(bool *aIsPendingUnforced) override; // nsIHttpChannelInternal NS_IMETHOD GetDocumentURI(nsIURI **aDocumentURI) override; diff --git a/netwerk/protocol/http/NullHttpChannel.cpp b/netwerk/protocol/http/NullHttpChannel.cpp index 8b362cb24233..8c048a6b5a7e 100644 --- a/netwerk/protocol/http/NullHttpChannel.cpp +++ b/netwerk/protocol/http/NullHttpChannel.cpp @@ -82,12 +82,6 @@ NullHttpChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP -NullHttpChannel::IsPendingUnforced(bool *_retval) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -NS_IMETHODIMP NullHttpChannel::GetTransferSize(uint64_t *aTransferSize) { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/netwerk/protocol/http/nsIHttpChannel.idl b/netwerk/protocol/http/nsIHttpChannel.idl index 0de0676ad156..75ec2c73989a 100644 --- a/netwerk/protocol/http/nsIHttpChannel.idl +++ b/netwerk/protocol/http/nsIHttpChannel.idl @@ -14,7 +14,7 @@ interface nsIHttpHeaderVisitor; * the inspection of the resulting HTTP response status and headers when they * become available. */ -[builtinclass, scriptable, uuid(e0d8071b-5389-48c2-92c7-6708c968044d)] +[builtinclass, scriptable, uuid(c5a4a073-4539-49c7-a3f2-cec3f0619c6c)] interface nsIHttpChannel : nsIChannel { /************************************************************************** @@ -469,11 +469,4 @@ interface nsIHttpChannel : nsIChannel * this channels is being load in. */ attribute uint64_t topLevelContentWindowId; - - /** - * Returns true if a request is pending due to "natural" causes and - * not just because ForcePending() has been called. See isPending() - * in nsIRequest.idl for more details about pending requests. - */ - boolean isPendingUnforced(); }; diff --git a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp index 9f9b89438fba..9ed71c4ef001 100644 --- a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp +++ b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp @@ -740,17 +740,6 @@ nsViewSourceChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP -nsViewSourceChannel::IsPendingUnforced(bool *result) -{ - if (mHttpChannel) { - return mHttpChannel->IsPendingUnforced(result); - } - - NS_ENSURE_TRUE(mChannel, NS_ERROR_FAILURE); - return mChannel->IsPending(result); -} - -NS_IMETHODIMP nsViewSourceChannel::GetRequestMethod(nsACString & aRequestMethod) { return !mHttpChannel ? NS_ERROR_NULL_POINTER : diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 4a7fd7f92f15..51a7ee0f6ab6 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -41,7 +41,6 @@ #include "nsThreadUtils.h" #include "nsAutoPtr.h" #include "nsIMutableArray.h" -#include "nsISupportsPrimitives.h" // for nsISupportsPRBool // used to access our datastore of user-configured helper applications #include "nsIHandlerService.h" @@ -106,7 +105,6 @@ #include "mozilla/Preferences.h" #include "mozilla/ipc/URIUtils.h" -#include "mozilla/Unused.h" using namespace mozilla; using namespace mozilla::ipc; @@ -436,22 +434,6 @@ static nsresult GetDownloadDirectory(nsIFile **_directory, return NS_OK; } -static nsresult shouldCancel(bool *aShouldCancel) -{ - NS_ENSURE_ARG_POINTER(aShouldCancel); - - nsCOMPtr<nsISupportsPRBool> cancelObj = - do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID); - cancelObj->SetData(false); - nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService(); - if (!obs) - return NS_ERROR_FAILURE; - - obs->NotifyObservers(cancelObj, "external-app-requested", nullptr); - cancelObj->GetData(aShouldCancel); - return NS_OK; -} - /** * Structure for storing extension->type mappings. * @see defaultMimeEntries @@ -1028,14 +1010,6 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI, return NS_OK; // explicitly denied } - // Give other modules, including extensions, a chance to cancel. - bool doCancel = false; - rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - return NS_OK; - } - nsCOMPtr<nsIHandlerInfo> handler; rv = GetProtocolHandlerInfo(scheme, getter_AddRefs(handler)); NS_ENSURE_SUCCESS(rv, rv); @@ -1669,37 +1643,6 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo return NS_OK; } - // Give other modules, including extensions, a chance to cancel. - // To avoid a problem where OnDataAvailable fires but is not handled - // correctly while a modal dialog displayed by Torbutton is open, we - // suspend and then we either cancel or resume active requests. - // See bugs 21766 and 21886. - bool isPending = false; - nsCOMPtr<nsIHttpChannel> httpChan = do_QueryInterface(request); - if (httpChan) { - rv = httpChan->IsPendingUnforced(&isPending); - } else { - rv = request->IsPending(&isPending); - } - NS_ENSURE_SUCCESS(rv, rv); - - if (isPending) { - Unused << request->Suspend(); // Best effort: ignore failures. - } - - bool doCancel = false; - rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - mCanceled = true; - request->Cancel(NS_BINDING_ABORTED); - return NS_OK; - } - - if (isPending) { - Unused << request->Resume(); // Best effort: ignore failures. - } - rv = SetUpTempFile(aChannel); if (NS_FAILED(rv)) { nsresult transferError = rv;

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog."
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 7c3bb9697882b07c1ad4a496b0ce2e8ec2593969 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 18 16:22:32 2017 -0400 Revert "Bug 19273: Avoid JavaScript patching of the external app helper dialog." This reverts commit 648d842b127e6ca6457d43e45244c65ee1773aa3. --- netwerk/protocol/http/HttpBaseChannel.cpp | 7 --- netwerk/protocol/http/HttpBaseChannel.h | 1 - netwerk/protocol/http/NullHttpChannel.cpp | 6 --- netwerk/protocol/http/nsIHttpChannel.idl | 9 +--- .../protocol/viewsource/nsViewSourceChannel.cpp | 11 ----- .../exthandler/nsExternalHelperAppService.cpp | 57 ---------------------- 6 files changed, 1 insertion(+), 90 deletions(-) diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp index 5ea6a002a40f..e0f7edec05f9 100644 --- a/netwerk/protocol/http/HttpBaseChannel.cpp +++ b/netwerk/protocol/http/HttpBaseChannel.cpp @@ -1233,13 +1233,6 @@ NS_IMETHODIMP HttpBaseChannel::SetTopLevelContentWindowId(uint64_t aWindowId) return NS_OK; } -NS_IMETHODIMP HttpBaseChannel::IsPendingUnforced(bool *aIsPendingUnforced) -{ - NS_ENSURE_ARG_POINTER(aIsPendingUnforced); - *aIsPendingUnforced = mIsPending; - return NS_OK; -} - NS_IMETHODIMP HttpBaseChannel::GetTransferSize(uint64_t *aTransferSize) { diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h index 3a1a8ba525b0..c8184a601b9e 100644 --- a/netwerk/protocol/http/HttpBaseChannel.h +++ b/netwerk/protocol/http/HttpBaseChannel.h @@ -190,7 +190,6 @@ public: NS_IMETHOD SetChannelId(const nsACString& aChannelId) override; NS_IMETHOD GetTopLevelContentWindowId(uint64_t *aContentWindowId) override; NS_IMETHOD SetTopLevelContentWindowId(uint64_t aContentWindowId) override; - NS_IMETHOD IsPendingUnforced(bool *aIsPendingUnforced) override; // nsIHttpChannelInternal NS_IMETHOD GetDocumentURI(nsIURI **aDocumentURI) override; diff --git a/netwerk/protocol/http/NullHttpChannel.cpp b/netwerk/protocol/http/NullHttpChannel.cpp index 8b362cb24233..8c048a6b5a7e 100644 --- a/netwerk/protocol/http/NullHttpChannel.cpp +++ b/netwerk/protocol/http/NullHttpChannel.cpp @@ -82,12 +82,6 @@ NullHttpChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP -NullHttpChannel::IsPendingUnforced(bool *_retval) -{ - return NS_ERROR_NOT_IMPLEMENTED; -} - -NS_IMETHODIMP NullHttpChannel::GetTransferSize(uint64_t *aTransferSize) { return NS_ERROR_NOT_IMPLEMENTED; diff --git a/netwerk/protocol/http/nsIHttpChannel.idl b/netwerk/protocol/http/nsIHttpChannel.idl index 0de0676ad156..75ec2c73989a 100644 --- a/netwerk/protocol/http/nsIHttpChannel.idl +++ b/netwerk/protocol/http/nsIHttpChannel.idl @@ -14,7 +14,7 @@ interface nsIHttpHeaderVisitor; * the inspection of the resulting HTTP response status and headers when they * become available. */ -[builtinclass, scriptable, uuid(e0d8071b-5389-48c2-92c7-6708c968044d)] +[builtinclass, scriptable, uuid(c5a4a073-4539-49c7-a3f2-cec3f0619c6c)] interface nsIHttpChannel : nsIChannel { /************************************************************************** @@ -469,11 +469,4 @@ interface nsIHttpChannel : nsIChannel * this channels is being load in. */ attribute uint64_t topLevelContentWindowId; - - /** - * Returns true if a request is pending due to "natural" causes and - * not just because ForcePending() has been called. See isPending() - * in nsIRequest.idl for more details about pending requests. - */ - boolean isPendingUnforced(); }; diff --git a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp index 9f9b89438fba..9ed71c4ef001 100644 --- a/netwerk/protocol/viewsource/nsViewSourceChannel.cpp +++ b/netwerk/protocol/viewsource/nsViewSourceChannel.cpp @@ -740,17 +740,6 @@ nsViewSourceChannel::SetTopLevelContentWindowId(uint64_t aWindowId) } NS_IMETHODIMP -nsViewSourceChannel::IsPendingUnforced(bool *result) -{ - if (mHttpChannel) { - return mHttpChannel->IsPendingUnforced(result); - } - - NS_ENSURE_TRUE(mChannel, NS_ERROR_FAILURE); - return mChannel->IsPending(result); -} - -NS_IMETHODIMP nsViewSourceChannel::GetRequestMethod(nsACString & aRequestMethod) { return !mHttpChannel ? NS_ERROR_NULL_POINTER : diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 7d2dad321b6c..1c0dd8ee66f7 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -41,7 +41,6 @@ #include "nsThreadUtils.h" #include "nsAutoPtr.h" #include "nsIMutableArray.h" -#include "nsISupportsPrimitives.h" // for nsISupportsPRBool // used to access our datastore of user-configured helper applications #include "nsIHandlerService.h" @@ -106,7 +105,6 @@ #include "mozilla/Preferences.h" #include "mozilla/ipc/URIUtils.h" -#include "mozilla/Unused.h" using namespace mozilla; using namespace mozilla::ipc; @@ -439,22 +437,6 @@ static nsresult GetDownloadDirectory(nsIFile **_directory, return NS_OK; } -static nsresult shouldCancel(bool *aShouldCancel) -{ - NS_ENSURE_ARG_POINTER(aShouldCancel); - - nsCOMPtr<nsISupportsPRBool> cancelObj = - do_CreateInstance(NS_SUPPORTS_PRBOOL_CONTRACTID); - cancelObj->SetData(false); - nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService(); - if (!obs) - return NS_ERROR_FAILURE; - - obs->NotifyObservers(cancelObj, "external-app-requested", nullptr); - cancelObj->GetData(aShouldCancel); - return NS_OK; -} - /** * Structure for storing extension->type mappings. * @see defaultMimeEntries @@ -1132,14 +1114,6 @@ nsExternalHelperAppService::LoadURI(nsIURI *aURI, return NS_OK; // explicitly denied } - // Give other modules, including extensions, a chance to cancel. - bool doCancel = false; - rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - return NS_OK; - } - nsCOMPtr<nsIHandlerInfo> handler; rv = GetProtocolHandlerInfo(scheme, getter_AddRefs(handler)); NS_ENSURE_SUCCESS(rv, rv); @@ -1764,37 +1738,6 @@ NS_IMETHODIMP nsExternalAppHandler::OnStartRequest(nsIRequest *request, nsISuppo return NS_OK; } - // Give other modules, including extensions, a chance to cancel. - // To avoid a problem where OnDataAvailable fires but is not handled - // correctly while a modal dialog displayed by Torbutton is open, we - // suspend and then we either cancel or resume active requests. - // See bugs 21766 and 21886. - bool isPending = false; - nsCOMPtr<nsIHttpChannel> httpChan = do_QueryInterface(request); - if (httpChan) { - rv = httpChan->IsPendingUnforced(&isPending); - } else { - rv = request->IsPending(&isPending); - } - NS_ENSURE_SUCCESS(rv, rv); - - if (isPending) { - Unused << request->Suspend(); // Best effort: ignore failures. - } - - bool doCancel = false; - rv = shouldCancel(&doCancel); - NS_ENSURE_SUCCESS(rv, rv); - if (doCancel) { - mCanceled = true; - request->Cancel(NS_BINDING_ABORTED); - return NS_OK; - } - - if (isPending) { - Unused << request->Resume(); // Best effort: ignore failures. - } - rv = SetUpTempFile(aChannel); if (NS_FAILED(rv)) { nsresult transferError = rv;

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Bug 1358647 - Disallow bind/listen/accept for Linux content processes. r=gcp
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 6f946f9a53add44040dde190498c39d14922ec6e Author: Jed Davis <jld(a)mozilla.com> Date: Tue Apr 25 19:29:32 2017 -0600 Bug 1358647 - Disallow bind/listen/accept for Linux content processes. r=gcp MozReview-Commit-ID: Cz9MKxOJnsS --HG-- extra : rebase_source : d3ab7ff9020066d5fe9ac3121c88c85b9fde6224 --- security/sandbox/linux/SandboxFilter.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp index 018e9c64446c..f1520aa29e15 100644 --- a/security/sandbox/linux/SandboxFilter.cpp +++ b/security/sandbox/linux/SandboxFilter.cpp @@ -531,10 +531,6 @@ public: case SYS_SEND: case SYS_SOCKET: // DANGEROUS case SYS_CONNECT: // DANGEROUS - case SYS_ACCEPT: - case SYS_ACCEPT4: - case SYS_BIND: - case SYS_LISTEN: case SYS_GETSOCKOPT: case SYS_SETSOCKOPT: case SYS_GETSOCKNAME:

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Bug 1286865 - Step 0: Turn off crash-on-seccomp-fail by default on non-nightly. r=gcp
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit a878b3789b8b338124ba79efb5abba5f9bc34455 Author: Jed Davis <jld(a)mozilla.com> Date: Fri Jan 27 14:25:50 2017 -0700 Bug 1286865 - Step 0: Turn off crash-on-seccomp-fail by default on non-nightly. r=gcp MozReview-Commit-ID: 1It6HNizbAc --HG-- extra : rebase_source : 1e96f11904abf2c38c5b4e50de7609ddc86cdd8a --- security/sandbox/linux/Sandbox.cpp | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/security/sandbox/linux/Sandbox.cpp b/security/sandbox/linux/Sandbox.cpp index 7f1182be9972..b4e65a1745df 100644 --- a/security/sandbox/linux/Sandbox.cpp +++ b/security/sandbox/linux/Sandbox.cpp @@ -73,6 +73,8 @@ int gSeccompTsyncBroadcastSignum = 0; namespace mozilla { +static bool gSandboxCrashOnError = false; + // This is initialized by SandboxSetCrashFunc(). SandboxCrashFunc gSandboxCrashFunc; @@ -148,15 +150,18 @@ SigSysHandler(int nr, siginfo_t *info, void *void_context) // TODO, someday when this is enabled on MIPS: include the two extra // args in the error message. SANDBOX_LOG_ERROR("seccomp sandbox violation: pid %d, syscall %d," - " args %d %d %d %d %d %d. Killing process.", + " args %d %d %d %d %d %d.%s", pid, syscall_nr, - args[0], args[1], args[2], args[3], args[4], args[5]); + args[0], args[1], args[2], args[3], args[4], args[5], + gSandboxCrashOnError ? " Killing process." : ""); - // Bug 1017393: record syscall number somewhere useful. - info->si_addr = reinterpret_cast<void*>(syscall_nr); + if (gSandboxCrashOnError) { + // Bug 1017393: record syscall number somewhere useful. + info->si_addr = reinterpret_cast<void*>(syscall_nr); - gSandboxCrashFunc(nr, info, &savedCtx); - _exit(127); + gSandboxCrashFunc(nr, info, &savedCtx); + _exit(127); + } } /** @@ -515,6 +520,21 @@ SandboxEarlyInit(GeckoProcessType aType) } MOZ_RELEASE_ASSERT(IsSingleThreaded()); + // Set gSandboxCrashOnError if appropriate. This doesn't need to + // happen this early, but for now it's here so that I don't need to + // add NSPR dependencies for PR_GetEnv. + // + // This also means that users with "unexpected threads" setups won't + // crash even on nightly. +#ifdef NIGHTLY_BUILD + gSandboxCrashOnError = true; +#endif + if (const char* envVar = getenv("MOZ_SANDBOX_CRASH_ON_ERROR")) { + if (envVar[0]) { + gSandboxCrashOnError = envVar[0] != '0'; + } + } + // Which kinds of resource isolation (of those that need to be set // up at this point) can be used by this process? bool canChroot = false;

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Bug 1320085 - Allow the getrlimit-equivalent subset of prlimit64. r=tedd
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 99459c71ad61f1d7fb3995e616771a30516cf25b Author: Jed Davis <jld(a)mozilla.com> Date: Mon Nov 28 12:05:28 2016 -0700 Bug 1320085 - Allow the getrlimit-equivalent subset of prlimit64. r=tedd This applies only to content processes, where we already allow getrlimit (but not setrlimit). The rule added here does not allow using prlimit64 to set any resource limits or interact with any other process. MozReview-Commit-ID: nMry3t6QPj --HG-- extra : rebase_source : ecf792077a672ab1f2c5edf9fbeb915a0d8dd30e --- security/sandbox/linux/SandboxFilter.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp index f8db9dc802ea..018e9c64446c 100644 --- a/security/sandbox/linux/SandboxFilter.cpp +++ b/security/sandbox/linux/SandboxFilter.cpp @@ -735,6 +735,18 @@ public: CASES_FOR_getresgid: return Allow(); + case __NR_prlimit64: { + // Allow only the getrlimit() use case. (glibc seems to use + // only pid 0 to indicate the current process; pid == getpid() + // is equivalent and could also be allowed if needed.) + Arg<pid_t> pid(0); + // This is really a const struct ::rlimit*, but Arg<> doesn't + // work with pointers, only integer types. + Arg<uintptr_t> new_limit(2); + return If(AllOf(pid == 0, new_limit == 0), Allow()) + .Else(InvalidSyscall()); + } + case __NR_umask: case __NR_kill: case __NR_wait4:

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Bug 1361238 - Re-allow accept4, used by accessibility. r=gcp
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 724bcf6dc8132b87eaf397494d777a30f7cd8210 Author: Jed Davis <jld(a)mozilla.com> Date: Mon May 1 21:51:11 2017 -0600 Bug 1361238 - Re-allow accept4, used by accessibility. r=gcp MozReview-Commit-ID: 3M3T3bkx4nP --HG-- extra : rebase_source : b67332889615ae34cc67737da361f21ae545aeb4 --- security/sandbox/linux/SandboxFilter.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp index f1520aa29e15..7e1771a62665 100644 --- a/security/sandbox/linux/SandboxFilter.cpp +++ b/security/sandbox/linux/SandboxFilter.cpp @@ -531,6 +531,7 @@ public: case SYS_SEND: case SYS_SOCKET: // DANGEROUS case SYS_CONNECT: // DANGEROUS + case SYS_ACCEPT4: // Used by a11y; see bug 1361238 case SYS_GETSOCKOPT: case SYS_SETSOCKOPT: case SYS_GETSOCKNAME:

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Bug 1355274 - Polyfill SOCK_DGRAM socketpairs with SOCK_SEQPACKET, for libasyncns. r=gcp
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 458e18efb75ff80d270cc875ac7c200da705752c Author: Jed Davis <jld(a)mozilla.com> Date: Tue Apr 11 20:55:34 2017 -0600 Bug 1355274 - Polyfill SOCK_DGRAM socketpairs with SOCK_SEQPACKET, for libasyncns. r=gcp MozReview-Commit-ID: 2DeklSGsjUV --HG-- extra : rebase_source : 8a202c23dc9a3ddede49b08ce1e0792dfb40bdbf --- security/sandbox/linux/SandboxFilter.cpp | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/security/sandbox/linux/SandboxFilter.cpp b/security/sandbox/linux/SandboxFilter.cpp index 7e1771a62665..5ddd58029e85 100644 --- a/security/sandbox/linux/SandboxFilter.cpp +++ b/security/sandbox/linux/SandboxFilter.cpp @@ -496,6 +496,16 @@ class ContentSandboxPolicy : public SandboxPolicyCommon { return 0; } + static intptr_t SocketpairDatagramTrap(ArgsRef aArgs, void* aux) { + auto fds = reinterpret_cast<int*>(aArgs.args[3]); + // Return sequential packet sockets instead of the expected + // datagram sockets; see bug 1355274 for details. + if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds) != 0) { + return -errno; + } + return 0; + } + public: explicit ContentSandboxPolicy(SandboxBrokerClient* aBroker):mBroker(aBroker) { } virtual ~ContentSandboxPolicy() { } @@ -508,6 +518,7 @@ public: switch(aCall) { case SYS_RECVFROM: case SYS_SENDTO: + case SYS_SENDMMSG: // libresolv via libasyncns; see bug 1355274 return Some(Allow()); case SYS_SOCKETPAIR: { @@ -517,9 +528,12 @@ public: return Some(Allow()); } Arg<int> domain(0), type(1); - return Some(If(AllOf(domain == AF_UNIX, - AnyOf(type == SOCK_STREAM, type == SOCK_SEQPACKET)), - Allow()) + return Some(If(domain == AF_UNIX, + Switch(type) + .Case(SOCK_STREAM, Allow()) + .Case(SOCK_SEQPACKET, Allow()) + .Case(SOCK_DGRAM, Trap(SocketpairDatagramTrap, nullptr)) + .Default(InvalidSyscall())) .Else(InvalidSyscall())); }

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Bug 1337162 - Enable the Linux content sandbox for non-Nightly builds. r=ted
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit f439d50e540ed21a474a2062d1b902931c042a3e Author: Gian-Carlo Pascutto <gcp(a)mozilla.com> Date: Mon Feb 27 18:01:33 2017 +0100 Bug 1337162 - Enable the Linux content sandbox for non-Nightly builds. r=ted MozReview-Commit-ID: 65aPquHzyfP --HG-- extra : rebase_source : 017080e3ae33289bb0b6a790027f9d02c380d47b --- old-configure.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/old-configure.in b/old-configure.in index 0a0ba4465700..f5a2f05629ce 100644 --- a/old-configure.in +++ b/old-configure.in @@ -3997,14 +3997,14 @@ if test -n "$gonkdir"; then MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX fi -case "$OS_TARGET:$NIGHTLY_BUILD" in -WINNT:*) +case "$OS_TARGET" in +WINNT) MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX ;; -Darwin:*) +Darwin) MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX ;; -Linux:1) +Linux) case $CPU_ARCH in x86_64|x86) MOZ_CONTENT_SANDBOX=$MOZ_SANDBOX

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Bug 1374281. r=jld
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 74a7688a81cb539e02431fff6dea8ee204b6ff80 Author: Gian-Carlo Pascutto <gcp(a)mozilla.com> Date: Mon Jun 19 20:07:38 2017 +0200 Bug 1374281. r=jld MozReview-Commit-ID: Ko5m5i4Wkd6 --HG-- extra : rebase_source : 3076315ef3639a89f752addbb01d5d08a9c2db75 --- security/sandbox/linux/broker/SandboxBroker.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/security/sandbox/linux/broker/SandboxBroker.cpp b/security/sandbox/linux/broker/SandboxBroker.cpp index a31d1fc6684a..d79656c3407f 100644 --- a/security/sandbox/linux/broker/SandboxBroker.cpp +++ b/security/sandbox/linux/broker/SandboxBroker.cpp @@ -360,6 +360,10 @@ AllowOpen(int aReqFlags, int aPerms) if (aReqFlags & O_CREAT) { needed |= SandboxBroker::MAY_CREATE; } + // Linux allows O_TRUNC even with O_RDONLY + if (aReqFlags & O_TRUNC) { + needed |= SandboxBroker::MAY_WRITE; + } return (aPerms & needed) == needed; }

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Bug 1386279 - Renovate Linux sandbox file broker handling of access(). r=gcp
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit b4d1d2223d7fed2bd88b06fa4e0f65936618d417 Author: Jed Davis <jld(a)mozilla.com> Date: Tue Aug 8 18:02:31 2017 -0600 Bug 1386279 - Renovate Linux sandbox file broker handling of access(). r=gcp 1. X_OK is now allowed, and is limited only by the MAY_ACCESS permission. 2. The actual access() syscall is now used, if access is granted by the broker policy. This fixed bug 1382246, which explains the background. MozReview-Commit-ID: 926429PlBnL --HG-- extra : rebase_source : 6ae54c4c25e1389fa3af75b0bdf727323448294a --- security/sandbox/linux/broker/SandboxBroker.cpp | 14 ++------------ security/sandbox/linux/gtest/TestBroker.cpp | 15 +++++++++++---- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/security/sandbox/linux/broker/SandboxBroker.cpp b/security/sandbox/linux/broker/SandboxBroker.cpp index d79656c3407f..56215b89b232 100644 --- a/security/sandbox/linux/broker/SandboxBroker.cpp +++ b/security/sandbox/linux/broker/SandboxBroker.cpp @@ -306,7 +306,7 @@ AllowOperation(int aReqFlags, int aPerms) static bool AllowAccess(int aReqFlags, int aPerms) { - if (aReqFlags & ~(R_OK|W_OK|F_OK)) { + if (aReqFlags & ~(R_OK|W_OK|X_OK|F_OK)) { return false; } int needed = 0; @@ -569,17 +569,7 @@ SandboxBroker::ThreadMain(void) case SANDBOX_FILE_ACCESS: if (permissive || AllowAccess(req.mFlags, perms)) { - // This can't use access() itself because that uses the ruid - // and not the euid. In theory faccessat() with AT_EACCESS - // would work, but Linux doesn't actually implement the - // flags != 0 case; glibc has a hack which doesn't even work - // in this case so it'll ignore the flag, and Bionic just - // passes through the syscall and always ignores the flags. - // - // Instead, because we've already checked the requested - // r/w/x bits against the policy, just return success if the - // file exists and hope that's close enough. - if (stat(pathBuf, (struct stat*)&respBuf) == 0) { + if (access(pathBuf, req.mFlags) == 0) { resp.mError = 0; } else { resp.mError = -errno; diff --git a/security/sandbox/linux/gtest/TestBroker.cpp b/security/sandbox/linux/gtest/TestBroker.cpp index a311e181a9b1..bf5e58acbc40 100644 --- a/security/sandbox/linux/gtest/TestBroker.cpp +++ b/security/sandbox/linux/gtest/TestBroker.cpp @@ -133,6 +133,8 @@ SandboxBrokerTest::GetPolicy() const policy->AddPath(MAY_READ | MAY_WRITE, "/tmp", AddAlways); policy->AddPath(MAY_READ | MAY_WRITE | MAY_CREATE, "/tmp/blublu", AddAlways); policy->AddPath(MAY_READ | MAY_WRITE | MAY_CREATE, "/tmp/blublublu", AddAlways); + // This should be non-writable by the user running the test: + policy->AddPath(MAY_READ | MAY_WRITE, "/etc", AddAlways); return Move(policy); } @@ -206,6 +208,14 @@ TEST_F(SandboxBrokerTest, Access) EXPECT_EQ(-EACCES, Access("/proc/self", R_OK)); EXPECT_EQ(-EACCES, Access("/proc/self/stat", F_OK)); + + EXPECT_EQ(0, Access("/tmp", X_OK)); + EXPECT_EQ(0, Access("/tmp", R_OK|X_OK)); + EXPECT_EQ(0, Access("/tmp", R_OK|W_OK|X_OK)); + EXPECT_EQ(0, Access("/proc/self", X_OK)); + + EXPECT_EQ(0, Access("/etc", R_OK|X_OK)); + EXPECT_EQ(-EACCES, Access("/etc", W_OK)); } TEST_F(SandboxBrokerTest, Stat) @@ -257,10 +267,7 @@ TEST_F(SandboxBrokerTest, Chmod) close(fd); // Set read only. SandboxBroker enforces 0600 mode flags. ASSERT_EQ(0, Chmod("/tmp/blublu", S_IRUSR)); - // SandboxBroker doesn't use real access(), it just checks against - // the policy. So it can't see the change in permisions here. - // This won't work: - // EXPECT_EQ(-EACCES, Access("/tmp/blublu", W_OK)); + EXPECT_EQ(-EACCES, Access("/tmp/blublu", W_OK)); statstruct realStat; EXPECT_EQ(0, statsyscall("/tmp/blublu", &realStat)); EXPECT_EQ((mode_t)S_IRUSR, realStat.st_mode & 0777);

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Bug 1317802 - don't stop for SIGSYS in .gdbinit; r=jld
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit f114f92dda8c67e8f013cf01974b0e1f65c0d04e Author: Nathan Froyd <froydnj(a)mozilla.com> Date: Wed Nov 16 01:13:22 2016 -0500 Bug 1317802 - don't stop for SIGSYS in .gdbinit; r=jld The sandboxing code generates this signal nowadays, which makes debugging with tools like rr quite frustrating. DONTBUILD because NPOTB --- .gdbinit | 1 + 1 file changed, 1 insertion(+) diff --git a/.gdbinit b/.gdbinit index dd9a005f67a1..08f1fc0f2011 100644 --- a/.gdbinit +++ b/.gdbinit @@ -16,6 +16,7 @@ handle SIGPIPE noprint nostop pass # sandboxing code on older kernels. handle SIG38 noprint nostop pass handle SIG64 noprint nostop pass +handle SIGSYS noprint nostop pass # Show the concrete types behind nsIFoo set print object on

1 0

[tor-browser/tor-browser-52.4.0esr-7.0-1] Bug 1344106 - Remove Linux todos() now that Linux sandboxing is riding the trains. r=haik
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit fcf32e4bdade5686f7dd3ca503d45fbfc6d56d2d Author: Haik Aftandilian <haftandilian(a)mozilla.com> Date: Fri Mar 3 09:50:29 2017 +0100 Bug 1344106 - Remove Linux todos() now that Linux sandboxing is riding the trains. r=haik MozReview-Commit-ID: 9tI2S6fEYkD --HG-- extra : rebase_source : 0a5d00f8498861e7ea281e527b2be6b2c4e472d6 --- .../sandbox/test/browser_content_sandbox_fs.js | 20 -------------------- .../test/browser_content_sandbox_syscalls.js | 22 +--------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/security/sandbox/test/browser_content_sandbox_fs.js b/security/sandbox/test/browser_content_sandbox_fs.js index 946f86bb9a92..7439bd46ee53 100644 --- a/security/sandbox/test/browser_content_sandbox_fs.js +++ b/security/sandbox/test/browser_content_sandbox_fs.js @@ -96,25 +96,11 @@ add_task(function*() { prefExists = false; } - // Special case Linux on !isNightly - if (isLinux() && !isNightly()) { - todo(prefExists, "pref security.sandbox.content.level exists"); - if (!prefExists) { - return; - } - } - ok(prefExists, "pref security.sandbox.content.level exists"); if (!prefExists) { return; } - // Special case Linux on !isNightly - if (isLinux() && !isNightly()) { - todo(level > 0, "content sandbox enabled for !nightly."); - return; - } - info(`security.sandbox.content.level=${level}`); ok(level > 0, "content sandbox is enabled."); if (level == 0) { @@ -124,12 +110,6 @@ add_task(function*() { let isFileIOSandboxed = isContentFileIOSandboxed(level); - // Special case Linux on !isNightly - if (isLinux() && !isNightly()) { - todo(isFileIOSandboxed, "content file I/O sandbox enabled for !nightly."); - return; - } - // Content sandbox enabled, but level doesn't include file I/O sandboxing. ok(isFileIOSandboxed, "content file I/O sandboxing is enabled."); if (!isFileIOSandboxed) { diff --git a/security/sandbox/test/browser_content_sandbox_syscalls.js b/security/sandbox/test/browser_content_sandbox_syscalls.js index d56456966b8a..848b145429f2 100644 --- a/security/sandbox/test/browser_content_sandbox_syscalls.js +++ b/security/sandbox/test/browser_content_sandbox_syscalls.js @@ -104,7 +104,7 @@ function areContentSyscallsSandboxed(level) { syscallsSandboxMinLevel = 1; break; case "Linux": - syscallsSandboxMinLevel = 2; + syscallsSandboxMinLevel = 1; break; default: Assert.ok(false, "Unknown OS"); @@ -140,25 +140,11 @@ add_task(function*() { prefExists = false; } - // Special case Linux on !isNightly - if (isLinux() && !isNightly()) { - todo(prefExists, "pref security.sandbox.content.level exists"); - if (!prefExists) { - return; - } - } - ok(prefExists, "pref security.sandbox.content.level exists"); if (!prefExists) { return; } - // Special case Linux on !isNightly - if (isLinux() && !isNightly()) { - todo(level > 0, "content sandbox enabled for !nightly."); - return; - } - info(`security.sandbox.content.level=${level}`); ok(level > 0, "content sandbox is enabled."); if (level == 0) { @@ -168,12 +154,6 @@ add_task(function*() { let areSyscallsSandboxed = areContentSyscallsSandboxed(level); - // Special case Linux on !isNightly - if (isLinux() && !isNightly()) { - todo(areSyscallsSandboxed, "content syscall sandbox enabled for !nightly."); - return; - } - // Content sandbox enabled, but level doesn't include syscall sandboxing. ok(areSyscallsSandboxed, "content syscall sandboxing is enabled."); if (!areSyscallsSandboxed) {

1 0

[torbutton/maint-1.9.7] Bug 23887: Update banner locales and Mozilla text
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit dea1b11a4e600bcb1bffde09d550e5022a6eb5d3 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Oct 16 23:09:56 2017 -0700 Bug 23887: Update banner locales and Mozilla text Also: change donation link to https://www.torproject.org/donate/donate-pdr-tbb-[locale] --- src/chrome/content/aboutTor/aboutTor.xhtml | 3 ++- src/chrome/content/aboutTor/donation_banner.js | 4 +++- src/chrome/skin/donation_banner.css | 23 ++++++++++++++++++++--- src/modules/donation-banner.js | 16 ++++++++++------ 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 367f9a6..248df11 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -37,8 +37,9 @@ window.addEventListener("pageshow", function() { <div id="banner-contents-container"> <div id="banner-tagline"><span></span></div> <div id="banner-slogan"><span></span></div> + <div id="banner-mozilla"><span></span></div> <a id="banner-donate-button-link" - href="https://www.torproject.org/donate/donate-tbb"> + href="https://www.torproject.org/donate/donate-pdr-tbb"> <div id="banner-donate-button"> <div id="banner-donate-button-inner"> <span></span> diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 1c95822..391c28f 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -46,6 +46,7 @@ let avoidWidows = function (element) { let updateTextSizes = function () { fitTextInElement(sel("#banner-tagline")); fitTextInElement(sel("#banner-slogan")); + fitTextInElement(sel("#banner-mozilla")); fitTextInElement(sel("#banner-donate-button-inner")); avoidWidows(sel("#banner-tagline span")); }; @@ -54,10 +55,11 @@ let updateTextSizes = function () { let randomInteger = max => Math.floor(max * Math.random()); // The main donation banner function. -let runDonationBanner = function ({ taglines, slogan, donate, shortLocale }) { +let runDonationBanner = function ({ taglines, slogan, mozilla, donate, shortLocale }) { try { sel("#banner-tagline span").innerText = taglines[randomInteger(taglines.length)]; sel("#banner-slogan span").innerText = slogan; + sel("#banner-mozilla span").innerText = mozilla; let donateButtonText = sel("#banner-donate-button-inner span"); let rtl = window.getComputedStyle(donateButtonText).direction === "rtl"; donateButtonText.innerHTML = donate + " " + (rtl ? "◀" : "▶"); diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css index 8580066..c91f0e5 100644 --- a/src/chrome/skin/donation_banner.css +++ b/src/chrome/skin/donation_banner.css @@ -58,8 +58,8 @@ right: 85px; } #banner-slogan { - align-items: start; - bottom: 0px; + align-items: center; + bottom: 30px; color: #f8f8a0; display: flex; font-family: monospace; @@ -68,13 +68,30 @@ position: absolute; right: 285px; text-align: start; - top: 100px; + top: 90px; white-space: nowrap; } #banner-slogan:-moz-dir(rtl) { left: 285px; right: 85px; } +#banner-mozilla { + align-items: center; + bottom: 5px; + color: white; + display: flex; + font-family: sans-serif; + left: 85px; + position: absolute; + right: 285px; + text-align: start; + top: 120px; + white-space: nowrap; +} +#banner-mozilla:-moz-dir(rtl) { + left: 285px; + right: 85px; +} #banner-donate-button { background-color: #13a513; border: 0px; diff --git a/src/modules/donation-banner.js b/src/modules/donation-banner.js index bb35e86..3a954e5 100644 --- a/src/modules/donation-banner.js +++ b/src/modules/donation-banner.js @@ -9,14 +9,17 @@ Cu.import("resource://gre/modules/Services.jsm"); const kBannerLocales = [ "bg", "da", + "de", "el", "en", "es", "fr", - "fr_CA", "is", "it", + "pt", "nb", + "ru", + "sv", "tr", ]; @@ -46,7 +49,7 @@ const gStringBundle = Services.strings.createBundle(kPropertiesURL); // Check if we should show the banner, depends on // browser locale, current date, and how many times // we have already shown the banner. -const shouldShowBanner = function ({ locale, shortLocale }) { +const shouldShowBanner = function (shortLocale) { try { // If our override test pref is true, then just show the banner regardless. if (Services.prefs.getBoolPref("extensions.torbutton.testBanner", false)) { @@ -58,7 +61,7 @@ const shouldShowBanner = function ({ locale, shortLocale }) { return false; } // Only show banner when we have that locale and if a donation redirect exists. - if (kBannerLocales.indexOf(locale) === -1 || + if (kBannerLocales.indexOf(shortLocale) === -1 || kDonationPageLocales.indexOf(shortLocale) === -1) { return false; } @@ -92,7 +95,7 @@ var bannerData = function () { // Read short locale. let locale = Services.prefs.getCharPref("general.useragent.locale"); let shortLocale = locale.match(/[a-zA-Z]+/)[0].toLowerCase(); - if (!shouldShowBanner({ locale, shortLocale })) { + if (!shouldShowBanner(shortLocale)) { return null; } // Load tag lines. @@ -102,10 +105,11 @@ var bannerData = function () { "aboutTor.donationBanner.tagline" + (index + 1)); taglines.push(tagline); } - // Read slogan and donate button text. + // Read slogan, mozilla, and donate button text. let slogan = gStringBundle.GetStringFromName("aboutTor.donationBanner.slogan"); + let mozilla = gStringBundle.GetStringFromName("aboutTor.donationBanner.mozilla"); let donate = gStringBundle.GetStringFromName("aboutTor.donationBanner.donate"); - return JSON.stringify({ taglines, slogan, donate, shortLocale }); + return JSON.stringify({ taglines, slogan, mozilla, donate, shortLocale }); }; // Export utility functions for external use.

1 0

[torbutton/maint-1.9.7] Translations update
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit ee8b054f31b53266f6165e76aa38ee7bd58eb55e Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 17 11:15:10 2017 +0000 Translations update --- src/chrome/content/torbutton.js | 2 +- src/chrome/locale/de/aboutTor.properties | 16 ++++++++-------- src/chrome/locale/es/aboutTor.properties | 2 +- src/chrome/locale/fr/aboutTor.properties | 2 +- src/chrome/locale/it/aboutTor.properties | 8 ++++---- src/chrome/locale/nl/aboutTor.properties | 8 ++++---- src/chrome/locale/pl/aboutTor.properties | 16 ++++++++-------- src/chrome/locale/pt-BR/aboutTor.properties | 2 +- src/chrome/locale/ru/aboutTor.properties | 10 +++++----- src/chrome/locale/ru/torbutton.dtd | 4 ++-- src/chrome/locale/sv/aboutTor.properties | 16 ++++++++-------- src/chrome/locale/tr/aboutTor.properties | 2 +- 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 955f8eb..9e18adb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2346,7 +2346,7 @@ function torbutton_update_noscript_button() // Update every window's NoScript status... while (browserEnumerator.hasMoreElements()) { let win = browserEnumerator.getNext(); - win.noscriptOverlay._syncUINow(); + //win.noscriptOverlay._syncUINow(); } torbutton_log(3, 'Updated NoScript status for security settings'); } catch (e) { diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties index 3233797..9d2b0df 100644 --- a/src/chrome/locale/de/aboutTor.properties +++ b/src/chrome/locale/de/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Jetzt spenden! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: Digitalen Widerstand stärken +aboutTor.donationBanner.mozilla=Spenden Sie heute und Mozilla wird Ihr Geschenk anpassen -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline1=Schützt seit 2006 Journalisten, Whistleblower & Aktivisten +aboutTor.donationBanner.tagline2=Weltweite Vernetzungsfreiheit +aboutTor.donationBanner.tagline3=Freiheit online +aboutTor.donationBanner.tagline4=Fördert weltweit freie Meinungsäußerung. +aboutTor.donationBanner.tagline5=Schützt täglich die Privatsphäre von Millionen. diff --git a/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties index 01cd311..f1e2d59 100644 --- a/src/chrome/locale/es/aboutTor.properties +++ b/src/chrome/locale/es/aboutTor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/?kl=-es aboutTor.donationBanner.donate=¡Dona ahora! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: Impulsando la resistencia digital aboutTor.donationBanner.mozilla=¡Dona hoy y Mozilla te la igualará! aboutTor.donationBanner.tagline1=Protegiendo a periodistas, informantes, y activistas desde 2006 diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties index bdaedb7..cd844af 100644 --- a/src/chrome/locale/fr/aboutTor.properties +++ b/src/chrome/locale/fr/aboutTor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Faites un don maintenant ! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor : la puissance de la résistance numérique aboutTor.donationBanner.mozilla=Faites un don aujourd'hui et Mozilla fera un don équivalent ! aboutTor.donationBanner.tagline1=Nous protégeons journalistes, lanceurs d'alerte et activistes depuis 2006 diff --git a/src/chrome/locale/it/aboutTor.properties b/src/chrome/locale/it/aboutTor.properties index 8d5b3a7..e25f90a 100644 --- a/src/chrome/locale/it/aboutTor.properties +++ b/src/chrome/locale/it/aboutTor.properties @@ -10,11 +10,11 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Dona adesso! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: alimentiamo la resistenza digitale +aboutTor.donationBanner.mozilla=Dona oggi e Mozilla ricambierà il regalo! aboutTor.donationBanner.tagline1=Proteggiamo giornalisti, informatori e attivisti dal 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline2=Rendiamo la rete libera nel mondo aboutTor.donationBanner.tagline3=Libertà online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline4=Promuoviamo la libertà di parola nel mondo aboutTor.donationBanner.tagline5=Proteggiamo la privacy di milioni di persone ogni giorno diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties index ee9cc49..521f96f 100644 --- a/src/chrome/locale/nl/aboutTor.properties +++ b/src/chrome/locale/nl/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Doneer nu! aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline2=Wereldwijde Netwerk Vrijheid +aboutTor.donationBanner.tagline3=Online Vrijheid aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline5=Beveiligt de privacy van miljoenen gebruikers per dag diff --git a/src/chrome/locale/pl/aboutTor.properties b/src/chrome/locale/pl/aboutTor.properties index dc12b3a..b6e1bba 100644 --- a/src/chrome/locale/pl/aboutTor.properties +++ b/src/chrome/locale/pl/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Wesprzyj teraz! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: Zasila Odporność Cyfrową +aboutTor.donationBanner.mozilla=Daj dzisiaj i Mozilla dopasuje Twój prezent! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline1=Chroni dziennikarzy, informatorów i aktywistów od 2006 +aboutTor.donationBanner.tagline2=Wolność dla sieci na całym świecie +aboutTor.donationBanner.tagline3=Wolność Online +aboutTor.donationBanner.tagline4=Wspieranie ekspresji na całym świecie +aboutTor.donationBanner.tagline5=Ochrona prywatności milionów każdego dnia diff --git a/src/chrome/locale/pt-BR/aboutTor.properties b/src/chrome/locale/pt-BR/aboutTor.properties index 84a283a..ca749aa 100644 --- a/src/chrome/locale/pt-BR/aboutTor.properties +++ b/src/chrome/locale/pt-BR/aboutTor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Faça uma Doação Agora! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: Desligando a Resistência Digital aboutTor.donationBanner.mozilla=Faça uma doação hoje e a Mozilla vai doará em dobro! aboutTor.donationBanner.tagline1=Protegendo Jornalistas, Whistleblowers e Ativistas desde 2006 diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties index 695436a..527d579 100644 --- a/src/chrome/locale/ru/aboutTor.properties +++ b/src/chrome/locale/ru/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Пожертвовать! aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline1=Защита журналистов, информаторов и активистов с 2006 года +aboutTor.donationBanner.tagline2=Свобода сети во всём мире +aboutTor.donationBanner.tagline3=Свобода в сети aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline5=Защита конфиденциальности миллионов каждый день diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 839bfca..fb05620 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -27,10 +27,10 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не защищать новые куки-файлы"> <!ENTITY torbutton.prefs.restrict_thirdparty "Блокировать сторонние куки-файлы и другие данные слежения"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Оставьте флажок напротив этой опции отмеченным, чтобы защитить многие функции обозревателя от элементов отслеживания ваших действий во время серфинга в сети. Модифицированные компоненты включают в себя ссылки на блобы, транслируемые каналы, кэш браузера, файлы куки, значки, заголовки аутентификации HTTP, ссылки предпросмотра, локальное хранилище, ссылки на медиаконтент, запросы OCSP, SharedWorkers и объявления сессии TLS."> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Оставьте флажок напротив этой функции отмеченным, чтобы защитить многие функции обозревателя от элементов отслеживания ваших действий во время серфинга в сети. Модифицированные компоненты включают в себя ссылки на блобы, транслируемые каналы, кэш браузера, файлы куки, значки, заголовки аутентификации HTTP, ссылки предпросмотра, локальное хранилище, ссылки на медиаконтент, запросы OCSP, SharedWorkers и объявления сессии TLS."> <!ENTITY torbutton.prefs.resist_fingerprinting "Изменить сведения, отличающие вас от других пользователей Tor Browser"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Оставьте флажок напротив этой функции отмеченным, чтобы скрыть от веб-узлов вещи , которые могут быть уникальными для вас, включая производительность компьютера, раскладку клавиатуры, язык, расположение и список установленных плагинов, состояние сети, ориентацию и размер экрана , значения масштабирования для конкретных узлов, поддерживаемые типы файлов, системные цвета и возможности WebGL."> <!ENTITY torbutton.prefs.sec_caption "Уровень безопасности"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Ползунок безопасности позволяет вам запретить некоторые особенности обозревателя, которые могут сделать ваш браузер более уязвимым к попыткам взлома."> <!ENTITY torbutton.prefs.sec_low "Низкий (по умолчанию)"> diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties index 64b0ed9..016ea20 100644 --- a/src/chrome/locale/sv/aboutTor.properties +++ b/src/chrome/locale/sv/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Donera nu! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: Kraftfull digital resistans +aboutTor.donationBanner.mozilla=Ge idag och Mozilla kommer att matcha din gåva! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline1=Skyddar journalister, whistleblowers och aktivister sedan 2006 +aboutTor.donationBanner.tagline2=Nätverksfrihet över hela världen +aboutTor.donationBanner.tagline3=Frihet på nåtet +aboutTor.donationBanner.tagline4=Främja yttrandefriheten över hela världen +aboutTor.donationBanner.tagline5=Skydda integriteten av miljoner varje dag diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties index 3b7a7d6..e07e35d 100644 --- a/src/chrome/locale/tr/aboutTor.properties +++ b/src/chrome/locale/tr/aboutTor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Bağış Yapın -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: Dijital Direnişi Güçlendiriyor aboutTor.donationBanner.mozilla=Destek olun ve Mozilla tarafından hediyenizin karşılığını alın! aboutTor.donationBanner.tagline1=2006 Yılından Beri Gazeteciler, Yolsuzlukları Açıklayanlar ve Aktivistler Korunuyor

1 0

[torbutton/maint-1.9.7] Bug 23483: Donation banner on about:tor for 2017
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 2e6d58145ff2de2ac705f2feebe3d594eab382a8 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Sep 18 16:42:07 2017 -0700 Bug 23483: Donation banner on about:tor for 2017 (Also removes a dot from aboutTor.donationBanner.slogan) --- src/chrome/content/aboutTor/aboutTor-content.js | 5 ++ src/chrome/content/aboutTor/aboutTor.xhtml | 19 +++- src/chrome/content/aboutTor/donation_banner.js | 105 ++++++++++++++++++++++ src/chrome/content/aboutTor/onion-hand.png | Bin 0 -> 69055 bytes src/chrome/content/torbutton.js | 4 +- src/chrome/locale/en/aboutTor.properties | 2 +- src/chrome/skin/donation_banner.css | 113 ++++++++++++++++++++++++ src/modules/donation-banner.js | 112 +++++++++++++++++++++++ 8 files changed, 357 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index ec515bb..95e8abd 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -105,6 +105,11 @@ var AboutTorListener = { else body.removeAttribute("showmanual"); + if (aData.bannerData) + body.setAttribute("banner-data", aData.bannerData); + else + body.removeAttribute("banner-data"); + // Setting body.initialized="yes" displays the body, which must be done // at this point because our remaining initialization depends on elements // being visible so that their size and position are accurate. diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 7ae4b8b..367f9a6 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -21,6 +21,8 @@ <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all" href="resource://torbutton/chrome/skin/aboutTor.css"/> + <link rel="stylesheet" type="text/css" media="all" + href="resource://torbutton/chrome/skin/donation_banner.css"/> <script type="text/javascript;version=1.7"> <![CDATA[ window.addEventListener("pageshow", function() { @@ -31,6 +33,21 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> + <div id="banner"> + <div id="banner-contents-container"> + <div id="banner-tagline"><span></span></div> + <div id="banner-slogan"><span></span></div> + <a id="banner-donate-button-link" + href="https://www.torproject.org/donate/donate-tbb"> + <div id="banner-donate-button"> + <div id="banner-donate-button-inner"> + <span></span> + </div> + </div> + </a> + </div> + </div> + <div id="banner-spacer"></div> <div id="torstatus" class="top"> <div id="torstatus-version"/> <div id="torstatus-image"/> @@ -112,6 +129,6 @@ window.addEventListener("pageshow", function() { <p>&aboutTor.footer.label; <a href="&aboutTor.learnMore.link;">&aboutTor.learnMore.label;</a></p> </div> - + <script src="resource://torbutton/chrome/content/aboutTor/donation_banner.js"></script> </body> </html> diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js new file mode 100644 index 0000000..1c95822 --- /dev/null +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -0,0 +1,105 @@ +/* jshint esnext:true */ + +let sel = selector => document.querySelector(selector); + +// Shrink the font size if the text in the given element is overflowing. +let fitTextInElement = function (element) { + element.style.fontSize = "8px"; + let defaultWidth = element.scrollWidth, + defaultHeight = element.scrollHeight; + let bestSize; + for (let testSize = 8; testSize <= 40; testSize += 0.5) { + element.style.fontSize = `${testSize}px`; + if (element.scrollWidth <= defaultWidth && + element.scrollHeight <= defaultHeight) { + bestSize = testSize; + } else { + break; + } + } + element.style.fontSize = `${bestSize}px`; +}; + +// Increase padding at end to "squeeze" text, until just before +// it gets squeezed so much that it gets longer vertically. +let avoidWidows = function (element) { + element.style.paddingRight = "0px"; + let originalWidth = element.scrollWidth; + let originalHeight = element.scrollHeight; + let bestPadding; + for (let testPadding = 0; testPadding < originalWidth; testPadding += 0.5) { + element.style.paddingRight = `${testPadding}px`; + if (element.scrollHeight <= originalHeight) { + bestPadding = testPadding; + } else { + break; + } + } + element.style.paddingRight = `${bestPadding}px`; + if (window.getComputedStyle(element).direction === "rtl") { + element.style.paddingLeft = element.style.paddingRight; + element.style.paddingRight = "0px"; + } +}; + +// Resize the text inside banner to fit. +let updateTextSizes = function () { + fitTextInElement(sel("#banner-tagline")); + fitTextInElement(sel("#banner-slogan")); + fitTextInElement(sel("#banner-donate-button-inner")); + avoidWidows(sel("#banner-tagline span")); +}; + +// Returns a random integer x, such that 0 <= x < max +let randomInteger = max => Math.floor(max * Math.random()); + +// The main donation banner function. +let runDonationBanner = function ({ taglines, slogan, donate, shortLocale }) { + try { + sel("#banner-tagline span").innerText = taglines[randomInteger(taglines.length)]; + sel("#banner-slogan span").innerText = slogan; + let donateButtonText = sel("#banner-donate-button-inner span"); + let rtl = window.getComputedStyle(donateButtonText).direction === "rtl"; + donateButtonText.innerHTML = donate + " " + (rtl ? "◀" : "▶"); + sel("#banner").style.display = "flex"; + sel("#banner-spacer").style.display = "block"; + addEventListener("resize", updateTextSizes); + updateTextSizes(); + // Add a suffix corresponding to locale so we can send user + // to a correctly-localized donation page via redirect. + sel("#banner-donate-button-link").href += "-" + shortLocale; + sel("#torstatus-image").style.display = "none"; + } catch (e) { + // Something went wrong. + console.error(e); + sel("#banner").style.display = "none"; + sel("#bannerSpacer").style.display = "none"; + sel("#torstatus-image").style.display = "block"; + } +}; + +// Calls callback(attributeValue) when the specified attribute changes on +// target. Returns a zero-arg function that stops observing. +let observeAttribute = function (target, attributeName, callback) { + let observer = new MutationObserver(mutations => { + mutations.forEach(mutation => { + if (mutation.type === "attributes" && + mutation.attributeName === attributeName) { + callback(target.getAttribute(attributeName)); + } + }); + }); + observer.observe(target, { attributes: true }); + return () => observer.disconnect(); +}; + +// Start the donation banner if "toron" has been set to "yes". +let stopObserving = observeAttribute(document.body, "toron", value => { + stopObserving(); + if (value === "yes") { + let bannerDataJSON = document.body.getAttribute("banner-data"); + if (bannerDataJSON && bannerDataJSON.length > 0) { + runDonationBanner(JSON.parse(bannerDataJSON)); + } + } +}); diff --git a/src/chrome/content/aboutTor/onion-hand.png b/src/chrome/content/aboutTor/onion-hand.png new file mode 100644 index 0000000..00a5a41 Binary files /dev/null and b/src/chrome/content/aboutTor/onion-hand.png differ diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index db6b694..955f8eb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -13,6 +13,7 @@ let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { bannerData } = Cu.import("resource://torbutton/modules/donation-banner.js", {}); const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion"; const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; @@ -450,7 +451,8 @@ var torbutton_abouttor_message_handler = { torOn: torbutton_tor_check_ok(), updateNeeded: torbutton_update_is_needed(), showManual: torbutton_show_torbrowser_manual(), - toolbarButtonXPos: torbutton_get_toolbarbutton_xpos() + toolbarButtonXPos: torbutton_get_toolbarbutton_xpos(), + bannerData: bannerData(), }; }, diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index 4436e21..d0d3a64 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Donate Now! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance. +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css new file mode 100644 index 0000000..8580066 --- /dev/null +++ b/src/chrome/skin/donation_banner.css @@ -0,0 +1,113 @@ +#banner { + -khtml-user-select: none; /* Konqueror */ + -moz-user-select: none; /* Firefox */ + -ms-user-select: none; /* Internet Explorer/Edge */ + -webkit-touch-callout: none; /* iOS Safari */ + -webkit-user-select: none; /* Chrome/Safari/Opera */ + display: none; + height: 150px; + justify-content: center; + left: 0px; + margin-top: 0px; + min-width: 900px; + opacity: 1; + position: absolute; + user-select: none; + width: 100%; + z-index: 1; +} +#banner:before { + background-color: #406; + background-image: url('resource://torbutton/chrome/content/aboutTor/onion-hand.png'); + background-position: center; + background-size: cover; + content: ""; + height: 150px; + left: 0px; + position: absolute; + top: 0px; + width: 100%; +} +#banner:-moz-dir(rtl):before { + transform: scaleX(-1); +} +#banner-contents-container { + align-items: center; + height: 100%; + max-width: 700px; + position: relative; + width: 700px; +} +#banner-tagline { + align-items: center; + bottom: 60px; + color: white; + display: flex; + font-family: monospace; + font-size: 8px; + font-weight: bold; + left: 85px; + position: absolute; + right: 0px; + text-align: start; + text-transform: uppercase; + top: 10px; +} +#banner-tagline:-moz-dir(rtl) { + left: 0px; + right: 85px; +} +#banner-slogan { + align-items: start; + bottom: 0px; + color: #f8f8a0; + display: flex; + font-family: monospace; + font-weight: bold; + left: 85px; + position: absolute; + right: 285px; + text-align: start; + top: 100px; + white-space: nowrap; +} +#banner-slogan:-moz-dir(rtl) { + left: 285px; + right: 85px; +} +#banner-donate-button { + background-color: #13a513; + border: 0px; + bottom: 10px; + color: #fbf7ef; + font-family: sans-serif; + font-size: 12px; + font-weight: bold; + left: 430px; + letter-spacing: -0.00em; + position: absolute; + right: 0px; + top: 100px; +} +#banner-donate-button:-moz-dir(rtl) { + left: 0px; + right: 430px; +} +#banner-donate-button:hover { + background-color: #38bc38; +} +#banner-donate-button-inner { + bottom: 6px; + display: flex; + justify-content: center; + left: 8px; + position: absolute; + right: 8px; + top: 6px; +} +#banner-spacer { + display: none; + height: 150px; + position: relative; + top: 0; +} diff --git a/src/modules/donation-banner.js b/src/modules/donation-banner.js new file mode 100644 index 0000000..bb35e86 --- /dev/null +++ b/src/modules/donation-banner.js @@ -0,0 +1,112 @@ +/* jshint esversion:6 */ + +const Cu = Components.utils; + +// ### Import Mozilla Services +Cu.import("resource://gre/modules/Services.jsm"); + +// A list of locales for which the banner has been translated. +const kBannerLocales = [ + "bg", + "da", + "el", + "en", + "es", + "fr", + "fr_CA", + "is", + "it", + "nb", + "tr", +]; + +// A list of donation page locales (at least redirects should exist). +const kDonationPageLocales = [ + "ar", + "de", + "en", + "es", + "fa", + "fr", + "it", + "ja", + "ko", + "nl", + "pl", + "pt", + "ru", + "tr", + "vi", + "zh", +]; + +const kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties"; +const gStringBundle = Services.strings.createBundle(kPropertiesURL); + +// Check if we should show the banner, depends on +// browser locale, current date, and how many times +// we have already shown the banner. +const shouldShowBanner = function ({ locale, shortLocale }) { + try { + // If our override test pref is true, then just show the banner regardless. + if (Services.prefs.getBoolPref("extensions.torbutton.testBanner", false)) { + return true; + } + // Don't show a banner if update is needed. + let updateNeeded = Services.prefs.getBoolPref("extensions.torbutton.updateNeeded"); + if (updateNeeded) { + return false; + } + // Only show banner when we have that locale and if a donation redirect exists. + if (kBannerLocales.indexOf(locale) === -1 || + kDonationPageLocales.indexOf(shortLocale) === -1) { + return false; + } + // Only show banner between 2017 Oct 23 and 2018 Jan 25. + let now = new Date(); + let start = new Date(2017, 9, 23); + let end = new Date(2018, 0, 26); + let shownCountPref = "extensions.torbutton.donation_banner2017.shown_count"; + if (now < start || now > end) { + // Clean up pref if not in use. + Services.prefs.clearUserPref(shownCountPref); + return false; + } + // Only show banner 50 times. + let count = 0; + if (Services.prefs.prefHasUserValue(shownCountPref)) { + count = Services.prefs.getIntPref(shownCountPref); + } + if (count >= 50) { + return false; + } + Services.prefs.setIntPref(shownCountPref, count+1); + return true; + } catch (e) { + return false; + } +}; + +// Read data needed for displaying banner on page. +var bannerData = function () { + // Read short locale. + let locale = Services.prefs.getCharPref("general.useragent.locale"); + let shortLocale = locale.match(/[a-zA-Z]+/)[0].toLowerCase(); + if (!shouldShowBanner({ locale, shortLocale })) { + return null; + } + // Load tag lines. + let taglines = []; + for (let index = 0; index < 5; ++index) { + let tagline = gStringBundle.GetStringFromName( + "aboutTor.donationBanner.tagline" + (index + 1)); + taglines.push(tagline); + } + // Read slogan and donate button text. + let slogan = gStringBundle.GetStringFromName("aboutTor.donationBanner.slogan"); + let donate = gStringBundle.GetStringFromName("aboutTor.donationBanner.donate"); + return JSON.stringify({ taglines, slogan, donate, shortLocale }); +}; + +// Export utility functions for external use. +var EXPORTED_SYMBOLS = ["bannerData"];

1 0

[torbutton/maint-1.9.7] Translations update
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit d46a79ded9874cdbb7857bbc7b75546425fe8293 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 22 07:36:11 2017 +0000 Translations update --- src/chrome/locale/ar/aboutTor.properties | 11 +++++++++++ src/chrome/locale/de/aboutTor.properties | 11 +++++++++++ src/chrome/locale/es/aboutTor.properties | 11 +++++++++++ src/chrome/locale/eu/aboutTor.properties | 11 +++++++++++ src/chrome/locale/fa/aboutTor.properties | 11 +++++++++++ src/chrome/locale/fr/aboutDialog.dtd | 6 +++--- src/chrome/locale/fr/aboutTor.dtd | 8 ++++---- src/chrome/locale/fr/aboutTor.properties | 11 +++++++++++ src/chrome/locale/fr/torbutton.dtd | 2 +- src/chrome/locale/fr/torbutton.properties | 14 +++++++------- src/chrome/locale/it/aboutTor.dtd | 2 +- src/chrome/locale/it/aboutTor.properties | 11 +++++++++++ src/chrome/locale/it/torbutton.dtd | 2 +- src/chrome/locale/ja/aboutTor.properties | 11 +++++++++++ src/chrome/locale/ko/aboutTor.properties | 11 +++++++++++ src/chrome/locale/nl/aboutTor.properties | 11 +++++++++++ src/chrome/locale/pl/aboutTor.properties | 11 +++++++++++ src/chrome/locale/pt-BR/aboutTor.properties | 11 +++++++++++ src/chrome/locale/pt-BR/torbutton.dtd | 2 +- src/chrome/locale/ru/aboutTBUpdate.dtd | 2 +- src/chrome/locale/ru/aboutTor.properties | 11 +++++++++++ src/chrome/locale/ru/torbutton.dtd | 2 +- src/chrome/locale/sv/aboutTor.properties | 11 +++++++++++ src/chrome/locale/tr/aboutTor.dtd | 2 +- src/chrome/locale/tr/aboutTor.properties | 11 +++++++++++ src/chrome/locale/tr/brand.properties | 2 +- src/chrome/locale/tr/torbutton.dtd | 4 ++-- src/chrome/locale/vi/aboutTor.properties | 11 +++++++++++ src/chrome/locale/zh-CN/aboutTor.properties | 11 +++++++++++ 29 files changed, 211 insertions(+), 24 deletions(-) diff --git a/src/chrome/locale/ar/aboutTor.properties b/src/chrome/locale/ar/aboutTor.properties index a93fa44..63cf16b 100644 --- a/src/chrome/locale/ar/aboutTor.properties +++ b/src/chrome/locale/ar/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=ابحث <a href="%1$S">آمنا</a> مع <a href="%2 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties index 132a3d0..3233797 100644 --- a/src/chrome/locale/de/aboutTor.properties +++ b/src/chrome/locale/de/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=<a href="%1$S">Sicheres</a> Suchen mit <a href="%2$S" aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day diff --git a/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties index 2c464fb..01cd311 100644 --- a/src/chrome/locale/es/aboutTor.properties +++ b/src/chrome/locale/es/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Busque <a href="%1$S">de forma segura</a> con <a href aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy?kl=-es # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/?kl=-es + +aboutTor.donationBanner.donate=¡Dona ahora! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=¡Dona hoy y Mozilla te la igualará! + +aboutTor.donationBanner.tagline1=Protegiendo a periodistas, informantes, y activistas desde 2006 +aboutTor.donationBanner.tagline2=Libertad de interconexión por todo el mundo +aboutTor.donationBanner.tagline3=Libertad en la red +aboutTor.donationBanner.tagline4=Fomentando la libertad de expresión por todo el mundo +aboutTor.donationBanner.tagline5=Protegiendo la privacidad de millones de personas cada día diff --git a/src/chrome/locale/eu/aboutTor.properties b/src/chrome/locale/eu/aboutTor.properties index ffd89fe..54adb53 100644 --- a/src/chrome/locale/eu/aboutTor.properties +++ b/src/chrome/locale/eu/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Bilatu<a href="%1$S">modu seguruan</a> ondokoarekin: aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day diff --git a/src/chrome/locale/fa/aboutTor.properties b/src/chrome/locale/fa/aboutTor.properties index 8b819db..3458e6e 100644 --- a/src/chrome/locale/fa/aboutTor.properties +++ b/src/chrome/locale/fa/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=جستجو <a href="%1$S">ایمن</a> با <a href=" aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day diff --git a/src/chrome/locale/fr/aboutDialog.dtd b/src/chrome/locale/fr/aboutDialog.dtd index 4b7da91..bc47fce 100644 --- a/src/chrome/locale/fr/aboutDialog.dtd +++ b/src/chrome/locale/fr/aboutDialog.dtd @@ -3,7 +3,7 @@ <!ENTITY project.tpoLink "le &vendorShortName;"> <!ENTITY project.end ", une organisation sans but lucratif travaillant à la protection de vos renseignements personnels et de votre liberté en ligne."> -<!ENTITY help.start "Voulez-vous aider ?"> +<!ENTITY help.start "Voulez-vous aider ?">  <!ENTITY help.donateLink "Faites un don"> <!ENTITY help.or "ou"> @@ -11,9 +11,9 @@ <!ENTITY help.getInvolvedLink "impliquez-vous"> <!ENTITY help.end " !">  -<!ENTITY bottomLinks.questions "Des questions ?"> +<!ENTITY bottomLinks.questions "Des questions ?">  -<!ENTITY bottomLinks.grow "Aidez à la croissance du réseau Tor !"> +<!ENTITY bottomLinks.grow "Aidez à la croissance du réseau Tor !">  <!ENTITY bottomLinks.license "Informations de licence"> <!ENTITY tor.TrademarkStatement "« Tor » et le « logo Oignon » sont des marques déposées de « The Tor Project, Inc. »"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index 6b5899d..8b1e3b1 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -15,7 +15,7 @@ <!ENTITY aboutTor.success.label "Bienvenue dans le navigateur Tor"> <!ENTITY aboutTor.success2.label "Connecté au réseau Tor."> <!ENTITY aboutTor.success3.label "Vous êtes maintenant libre de naviguer sur Internet anonymement."> -<!ENTITY aboutTor.failure.label "Une erreur s'est produite !"> +<!ENTITY aboutTor.failure.label "Une erreur s'est produite !"> <!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur."> <!ENTITY aboutTor.search.label "Rechercher"> @@ -25,13 +25,13 @@ <!ENTITY aboutTor.torInfo2.label "Pays & adresse IP :"> <!ENTITY aboutTor.torInfo3.label "Nœud de sortie :"> <!ENTITY aboutTor.torInfo4.label "Ce serveur ne journalise aucune information sur les visteurs."> -<!ENTITY aboutTor.whatnextQuestion.label "Que faire ensuite ?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor n'est PAS tout ce dont vous avez besoin pour naviguer anonymement! Vous aurez peut-être à changer certaines de vos habitudes de navigation pour garder votre identité en sécurité."> +<!ENTITY aboutTor.whatnextQuestion.label "Que faire ensuite ?"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor n'est PAS tout ce dont vous avez besoin pour naviguer anonymement ! Vous aurez peut-être à changer certaines de vos habitudes de navigation pour garder votre identité en sécurité."> <!ENTITY aboutTor.whatnext.label "Conseils pour rester anonyme »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html#warning"> <!ENTITY aboutTor.torbrowser_user_manual.accesskey "G"> <!ENTITY aboutTor.torbrowser_user_manual.label "Le guide d'utilisation du navigateur Tor"> -<!ENTITY aboutTor.helpInfo1.label "Vous pouvez aider !"> +<!ENTITY aboutTor.helpInfo1.label "Vous pouvez aider !"> <!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider à rendre le réseau Tor plus rapide et plus puissant de plusieurs façons :"> <!ENTITY aboutTor.helpInfo3.label "Faire tourner un nœud relais Tor »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html"> diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties index c5bec4c..bdaedb7 100644 --- a/src/chrome/locale/fr/aboutTor.properties +++ b/src/chrome/locale/fr/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Rechercher <a href="%1$S">en toute sécurité</a> ave aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Faites un don maintenant ! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Faites un don aujourd'hui et Mozilla fera un don équivalent ! + +aboutTor.donationBanner.tagline1=Nous protégeons journalistes, lanceurs d'alerte et activistes depuis 2006 +aboutTor.donationBanner.tagline2=Vers un réseau mondial de liberté +aboutTor.donationBanner.tagline3=La liberté en ligne +aboutTor.donationBanner.tagline4=Pour favoriser la libre expression dans le monde entier +aboutTor.donationBanner.tagline5=Nous protégeons les renseignements personnels de millions de personnes, chaque jour diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd index cbbbb95..978cbc1 100644 --- a/src/chrome/locale/fr/torbutton.dtd +++ b/src/chrome/locale/fr/torbutton.dtd @@ -37,7 +37,7 @@ <!ENTITY torbutton.prefs.sec_low_usable_desc "Cela offre l'expérience la plus conviviale."> <!ENTITY torbutton.prefs.sec_low_desc "À ce niveau de sécurité, toutes les fonctions du navigateur sont activées."> <!ENTITY torbutton.prefs.sec_font_rend_svg_tooltip "Le mécanisme de rendu de police SVG OpenType est désactivé."> -<!ENTITY torbutton.prefs.sec_gen_desc "À ce niveau de sécurité, les changements suivants sont applicables (survolez avec la souris pour plus de détails ) :"> +<!ENTITY torbutton.prefs.sec_gen_desc "À ce niveau de sécurité, les changements suivants sont applicables (survolez avec la souris pour plus de détails) :"> <!ENTITY torbutton.prefs.sec_html5_desc "Le contenu HTML5 vidéo et audio devient « cliquer pour lire » avec NoScript."> <!ENTITY torbutton.prefs.sec_html5_tooltip "Pour certains sites, vous aurez peut-être à utiliser le bouton NoScript de la barre d'outils pour activer ces objets multimédias."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Certaines optimisations de performance de JavaScript sont désactivées."> diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties index 907babc..945dc11 100644 --- a/src/chrome/locale/fr/torbutton.properties +++ b/src/chrome/locale/fr/torbutton.properties @@ -11,22 +11,22 @@ torbutton.panel.tooltip.enabled = Cliquer pour désactiver Tor torbutton.panel.label.disabled = Tor Inactif torbutton.panel.label.enabled = Tor Actif extensions.torbutton(a)torproject.org.description = BoutonTor fournit un bouton pour configurer les paramètres de Tor et vider facilement les données de navigation privée. -torbutton.popup.external.title = Télécharger un type de fichier externe +torbutton.popup.external.title = Télécharger un type de fichier externe ? torbutton.popup.external.app = Le Navigateur Tor ne peut pas afficher ce fichier. Il est necessaire de l'ouvrir avec une autre application. torbutton.popup.external.note = Certains types de fichiers peuvent causer des connexions à l'Internet sans passer par Tor pour certaines applications torbutton.popup.external.suggest = Par sécurité, vous ne devriez ouvrir les fichiers téléchargés que lorsque vous êtes hors ligne, ou en utilisant un CD autonome Tor comme Tails.\n torbutton.popup.launch = Télécharger le fichier torbutton.popup.cancel = Annuler torbutton.popup.dontask = Télécharger automatiquement à partir de maintenant -torbutton.popup.prompted_language = Pour renforcer votre anonymat, BoutonTor peut demander la version anglaise des pages Web. Les pages que vous préférez lire dans votre langue préférée pourraient alors s'afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais pour améliorer votre anonymat ? -torbutton.popup.no_newnym = BoutonTor ne peut pas vous délivrer une nouvelle identité de façon sûre. Il n'a pas accès au port de contrôle de Tor.\n\nUtilisez-vous l'offre groupée de navigation Tor ? +torbutton.popup.prompted_language = Pour renforcer votre anonymat, BoutonTor peut demander la version anglaise des pages Web. Les pages que vous préférez lire dans votre langue préférée pourraient alors s'afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais pour améliorer votre anonymat ? +torbutton.popup.no_newnym = BoutonTor ne peut pas vous attribuer une nouvelle identité de façon sûre. Il n'a pas accès au port de contrôle de Tor.\n\nUtilisez-vous l'offre groupée de navigation Tor ? torbutton.title.prompt_torbrowser = Informations importantes concernant BoutonTor torbutton.popup.prompt_torbrowser = BoutonTor fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il n'est pas sécuritaire d'utiliser BoutonTor dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger l'offre groupée de navigation Tor. Les propriétés de confidentialité du navigateur Tor sont aussi supérieures à celles de Firefox, même s'il est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor. -torbutton.popup.short_torbrowser = Informations importantes concernant BoutonTor !\n\nBoutonTor est dorénavant toujours activé.\n\nCliquer sur BoutonTor pour plus d'informations. +torbutton.popup.short_torbrowser = Informations importantes concernant BoutonTor !\n\nBoutonTor est toujours activé dorénavant.\n\nCliquer sur BoutonTor pour plus d'informations. -torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à votre anonymat et vie privée.\n\nIls peuvent également contourner Tor afin de révéler votre position actuelle ainsi que votre adresse IP.\n\nÊtes-vous certain de vouloir activer les greffons ?\n\n +torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à vos anonymat et vie privée.\n\nIls peuvent également contourner Tor afin de révéler votre position actuelle ainsi que votre adresse IP.\n\nÊtes-vous certain de vouloir activer les greffons ?\n\n torbutton.popup.never_ask_again = Ne plus me poser la question. -torbutton.popup.confirm_newnym = Le navigateur Tor fermera toutes les fenêtres et onglets. Toutes les sessions des sites Web seront perdues.\n\nRedémarrer le navigateur Tor maintenant pour réinitialiser votre identité ?\n\n +torbutton.popup.confirm_newnym = Le navigateur Tor fermera tous les fenêtres et onglets. Toutes les sessions des sites Web seront perdues.\n\nRedémarrer le navigateur Tor maintenant pour réinitialiser votre identité ?\n\n torbutton.slider_notification = Le menu de l'oignon vert propose maintenant un curseur de sécurité qui vous laisse ajuster votre niveau de sécurité. Découvrez-le ! torbutton.slider_notification_button = Ouvrir préférences de sécurité @@ -34,7 +34,7 @@ torbutton.slider_notification_button = Ouvrir préférences de sécurité torbutton.maximize_warning = Maximiser le navigateur Tor à l'écran peut permettre aux sites Web de déterminer votre taille de moniteur, laquelle peut être utilisée pour vous suivre à la trace. Nous recommandons que vous laissiez les fenêtres du navigateur Tor dans leur taille d'origine. # Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=Ce site Web (%S) a essayé d'extraire des données d'image de canevas HTML5, qui pourraient être utilisées pour identifier votre ordinateur de façon unique.\n\nLe navigateur Tor devrait-il permettre à ce site Web d'extraire des données d'image de canevas HTML5 ? +canvas.siteprompt=Ce site Web (%S) a essayé d'extraire des données d'image de canevas HTML5, qui pourraient être utilisées pour identifier votre ordinateur de façon unique.\n\nLe navigateur Tor devrait-il permettre à ce site Web d'extraire des données d'image de canevas HTML5 ? canvas.notNow=Pas maintenant canvas.notNowAccessKey=P canvas.allow=Autoriser à l’avenir diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd index 2794b02..a016f6b 100644 --- a/src/chrome/locale/it/aboutTor.dtd +++ b/src/chrome/locale/it/aboutTor.dtd @@ -12,7 +12,7 @@ <!ENTITY aboutTor.check.label "Test Impostazioni della Rete Tor"> -<!ENTITY aboutTor.success.label "Benvenuto nel Browser TOR"> +<!ENTITY aboutTor.success.label "Benvenuto nel browser TOR"> <!ENTITY aboutTor.success2.label "Connesso alla rete TOR."> <!ENTITY aboutTor.success3.label "Ora sei libero di navigare in internet anonimamente."> <!ENTITY aboutTor.failure.label "Qualcosa è Andato Storto!"> diff --git a/src/chrome/locale/it/aboutTor.properties b/src/chrome/locale/it/aboutTor.properties index ebd910f..8d5b3a7 100644 --- a/src/chrome/locale/it/aboutTor.properties +++ b/src/chrome/locale/it/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Cerca <a href="%1$S">in modo sicuro</a> con <a href=" aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Dona adesso! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Proteggiamo giornalisti, informatori e attivisti dal 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Libertà online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Proteggiamo la privacy di milioni di persone ogni giorno diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index a18ff01..d5aed79 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -12,7 +12,7 @@ <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton"> <!ENTITY torbutton.prefs.security_settings "Impostazioni di Sicurezza Tor Browser"> -<!ENTITY torbutton.prefs.restore_defaults "Ripristina Defaults"> +<!ENTITY torbutton.prefs.restore_defaults "Ripristina Default"> <!ENTITY torbutton.prefs.custom_warning "Le tue impostazioni del browser sembrano avere preferenze di sicurezza insolite. Per motivi di sicurezza e privacy, ti consigliamo di scegliere uno dei livelli di sicurezza predefiniti."> <!ENTITY torbutton.cookiedialog.title "Gestisci protezione Cookies"> <!ENTITY torbutton.cookiedialog.lockCol "Protetto"> diff --git a/src/chrome/locale/ja/aboutTor.properties b/src/chrome/locale/ja/aboutTor.properties index 04863e3..6fdf984 100644 --- a/src/chrome/locale/ja/aboutTor.properties +++ b/src/chrome/locale/ja/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a>で<a href="%1$S">安全 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day diff --git a/src/chrome/locale/ko/aboutTor.properties b/src/chrome/locale/ko/aboutTor.properties index 33ce0e8..d09b69c 100644 --- a/src/chrome/locale/ko/aboutTor.properties +++ b/src/chrome/locale/ko/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a>를 통해 <a href="%1$S aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties index a85279a..ee9cc49 100644 --- a/src/chrome/locale/nl/aboutTor.properties +++ b/src/chrome/locale/nl/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=<a href="%1$S">Veilig</a> zoeken met <a href="%2$S">D aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day diff --git a/src/chrome/locale/pl/aboutTor.properties b/src/chrome/locale/pl/aboutTor.properties index 28f1e0b..dc12b3a 100644 --- a/src/chrome/locale/pl/aboutTor.properties +++ b/src/chrome/locale/pl/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Szukaj <a href="%1$S">bezpiecznie</a> używając wysz aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day diff --git a/src/chrome/locale/pt-BR/aboutTor.properties b/src/chrome/locale/pt-BR/aboutTor.properties index 76e2b42..84a283a 100644 --- a/src/chrome/locale/pt-BR/aboutTor.properties +++ b/src/chrome/locale/pt-BR/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Buscar <a href="%1$S">com segurança</a> utilizando < aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Faça uma Doação Agora! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Faça uma doação hoje e a Mozilla vai doará em dobro! + +aboutTor.donationBanner.tagline1=Protegendo Jornalistas, Whistleblowers e Ativistas desde 2006 +aboutTor.donationBanner.tagline2=Construindo Redes de Liberdade no Mundo Todo +aboutTor.donationBanner.tagline3=Liberdade na Internet +aboutTor.donationBanner.tagline4=Promovendo Liberdade de Expressão no Mundo Todo +aboutTor.donationBanner.tagline5=Protegendo a Privacidade de Milhões de Pessoas Todos os Dias diff --git a/src/chrome/locale/pt-BR/torbutton.dtd b/src/chrome/locale/pt-BR/torbutton.dtd index c30395b..4cc12cb 100644 --- a/src/chrome/locale/pt-BR/torbutton.dtd +++ b/src/chrome/locale/pt-BR/torbutton.dtd @@ -6,7 +6,7 @@ <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Configurações da Rede Tor..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Aplicar Atualizações do Navegador Tor..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Procurar Atualizações do Navegador Tor..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Proteções contra Cookies..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> diff --git a/src/chrome/locale/ru/aboutTBUpdate.dtd b/src/chrome/locale/ru/aboutTBUpdate.dtd index 21221ac..e516637 100644 --- a/src/chrome/locale/ru/aboutTBUpdate.dtd +++ b/src/chrome/locale/ru/aboutTBUpdate.dtd @@ -1,5 +1,5 @@ <!ENTITY aboutTBUpdate.title "Обновление браузера Tor"> -<!ENTITY aboutTBUpdate.updated "Браузер Tor обновлён."> +<!ENTITY aboutTBUpdate.updated "Tor Browser обновлен."> <!ENTITY aboutTBUpdate.linkPrefix "Чтобы получить наиболее свежую информацию об этом выпуске,"> <!ENTITY aboutTBUpdate.linkLabel "посетите наш вебсайт"> <!ENTITY aboutTBUpdate.linkSuffix "."> diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties index 2c1cba6..695436a 100644 --- a/src/chrome/locale/ru/aboutTor.properties +++ b/src/chrome/locale/ru/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Ищите<a href="%1$S">безопасно</a> с <a aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 32018fe..839bfca 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -27,7 +27,7 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не защищать новые куки-файлы"> <!ENTITY torbutton.prefs.restrict_thirdparty "Блокировать сторонние куки-файлы и другие данные слежения"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Оставьте флажок напротив этой опции отмеченным, чтобы защитить многие функции обозревателя от элементов отслеживания ваших действий во время сёрфинга в сети. Модифицированные компоненты включают в себя ссылки на блобы, транслируемые каналы, кэш браузера, файлы куки, значки, заголовки аутентификации HTTP, ссылки предпросмотра, локальное хранилище, ссылки на медиаконтент, запросы OCSP, SharedWorkers и объявления сессии TLS."> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Оставьте флажок напротив этой опции отмеченным, чтобы защитить многие функции обозревателя от элементов отслеживания ваших действий во время серфинга в сети. Модифицированные компоненты включают в себя ссылки на блобы, транслируемые каналы, кэш браузера, файлы куки, значки, заголовки аутентификации HTTP, ссылки предпросмотра, локальное хранилище, ссылки на медиаконтент, запросы OCSP, SharedWorkers и объявления сессии TLS."> <!ENTITY torbutton.prefs.resist_fingerprinting "Изменить сведения, отличающие вас от других пользователей Tor Browser"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties index 3f8d276..64b0ed9 100644 --- a/src/chrome/locale/sv/aboutTor.properties +++ b/src/chrome/locale/sv/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Sök <a href="%1$S">säkert</a> med <a href="%2$S">Du aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd index c777790..9dd32fb 100644 --- a/src/chrome/locale/tr/aboutTor.dtd +++ b/src/chrome/locale/tr/aboutTor.dtd @@ -35,7 +35,7 @@ <!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı güçlü kılmaya yardımcı olabilmenin çeşitli yolları var:"> <!ENTITY aboutTor.helpInfo3.label "Tor Aktarıcı Noktası Çalıştır »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Gönüllü Hizmetlerde Bulunun »"> +<!ENTITY aboutTor.helpInfo4.label "Gönüllü Destekte Bulunun »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> <!ENTITY aboutTor.helpInfo5.label "Bağış Yapın »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties index 17ed50d..3b7a7d6 100644 --- a/src/chrome/locale/tr/aboutTor.properties +++ b/src/chrome/locale/tr/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=<a href="%2$S">DuckDuckGo</a> kullanarak <a href="%1$ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Bağış Yapın + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Destek olun ve Mozilla tarafından hediyenizin karşılığını alın! + +aboutTor.donationBanner.tagline1=2006 Yılından Beri Gazeteciler, Yolsuzlukları Açıklayanlar ve Aktivistler Korunuyor +aboutTor.donationBanner.tagline2=Tüm Dünyada Ağ Özgürlüğü +aboutTor.donationBanner.tagline3=Çevrimiçi Özgürlük +aboutTor.donationBanner.tagline4=Tüm Dünyada İfade Özgürlüğü Destekleniyor +aboutTor.donationBanner.tagline5=Her Gün Milyonlarca Kişinin Gizliliği Korunuyor diff --git a/src/chrome/locale/tr/brand.properties b/src/chrome/locale/tr/brand.properties index 2c16808..7c76426 100644 --- a/src/chrome/locale/tr/brand.properties +++ b/src/chrome/locale/tr/brand.properties @@ -8,7 +8,7 @@ brandFullName=Tor Browser vendorShortName=Tor Projesi homePageSingleStartMain=Firefox Start, içinde arama bulunan hızlı açılış sayfası -homePageImport=%S üzerinden açılış sayfanızı alın. +homePageImport=%S üzerinden açılış sayfanızı içe aktarın. homePageMigrationPageTitle=Açılış Sayfası Seçimi homePageMigrationDescription=Lütfen kullanmak istediğiniz açılış sayfasını seçin: diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd index 47faf53..7d1fc7e 100644 --- a/src/chrome/locale/tr/torbutton.dtd +++ b/src/chrome/locale/tr/torbutton.dtd @@ -30,7 +30,7 @@ <!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Bu seçeneği işaretleyerek, çeşitli web tarayıcıların, web sitelerinde yaptığınız işlemleri izlemesini engelleyebilirsiniz. Değiştirilen özellikler içinde blob İnternet adresleri, yayın kanalları, web tarayıcı ön belleği, çerezler, favicon dosyaları, HTTP Auth başlık bilgileri, ön bağlantı bilgileri, localStorage, mediaSource adresleri, OCSP istekleri, SharedWorkers ve TLS oturumu bulunur."> <!ENTITY torbutton.prefs.resist_fingerprinting "Diğer Tor Browser kullanıcılarından sizi ayıran ayrıntılar değiştirilsin"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Bilgisayarınızın performansı, klavye düzeni, yerel dil, kurulu eklentilerin konumu, kurulu eklentilerin listesi, ağınızın durumu, ekran yönlendirmesi, ekran boyutu, siteye bağlı özel yakınlaştırma seviyeleri, desteklenen dosya türleri, sistem renkleri ve WebGL yetenekleri gibi sizin için benzersiz olabilecek şeyleri gizlemek için bu kutuyu işaretli tutun."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Bilgisayarınızın başarımı, tuş takımı düzeni, yerel dil ayarları, yüklenmiş eklentilerin konumu, yüklenmiş eklentilerin listesi, ağınızın durumu, ekran yönlendirmesi, ekran boyutu, siteye bağlı özel yakınlaştırma seviyeleri, desteklenen dosya türleri, sistem renkleri ve WebGL yetenekleri gibi size özel olan ve kimliğinizin belirlenmesinde kullanılabilecek bilgileri gizlemek için bu kutuyu işaretlenmiş olarak tutun."> <!ENTITY torbutton.prefs.sec_caption "Güvenlik Düzeyi"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Güvenlik ayarı ile belirli web tarayıcı özeliklerini kapatabilirsiniz. Ancak bu durumda web tarayıcınız saldırılara karşı daha korumasız olur."> <!ENTITY torbutton.prefs.sec_low "Düşük (varsayılan)"> @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 görüntü ve ses ortamı NoScript aracılığıyla tıklayıp oynat şekline dönüştürülür."> <!ENTITY torbutton.prefs.sec_html5_tooltip "Bazı sitelerde bu ortam nesnelerini etkinleştirebilmek için NoScript düğmesinin kullanılması gerekebilir."> <!ENTITY torbutton.prefs.sec_some_jit_desc "Bazı JavaScript başarım iyileştirmeleri devre dışı bırakılır."> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Doğal Düzenli İfade."> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT, Doğal Kurallı İfade"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Sınır Çizgi JIT."> <!ENTITY torbutton.prefs.sec_jit_slower_desc "Bazı sitelerde betikler daha yavaş çalışabilir."> <!ENTITY torbutton.prefs.sec_mathml_desc "Matematik denklemlerini görüntüleyen bazı düzenekler devre dışı bırakılır."> diff --git a/src/chrome/locale/vi/aboutTor.properties b/src/chrome/locale/vi/aboutTor.properties index 6cdeffb..ca9fa4e 100644 --- a/src/chrome/locale/vi/aboutTor.properties +++ b/src/chrome/locale/vi/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Tìm kiếm <a href="%1$S">một cách an toàn</a>v aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day diff --git a/src/chrome/locale/zh-CN/aboutTor.properties b/src/chrome/locale/zh-CN/aboutTor.properties index 0bd6766..32beeb1 100644 --- a/src/chrome/locale/zh-CN/aboutTor.properties +++ b/src/chrome/locale/zh-CN/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=使用<a href="%2$S">DuckDuckGo</a><a href="%1$S">安 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day

1 0

[torbutton/maint-1.9.7] Bug 23526: 2017 Donation banner text ready for translation
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit d49b20fe1bd98a9c13c12f9cdeb32f15427086de Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 14 21:41:36 2017 -0700 Bug 23526: 2017 Donation banner text ready for translation --- src/chrome/locale/en/aboutTor.properties | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index f9723bf..4436e21 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -7,3 +7,14 @@ aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ + +aboutTor.donationBanner.donate=Donate Now! + +aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance. +aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! + +aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 +aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day

1 0

[torbutton/maint-1.9.7] fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 61aaf90a94efd737213e31405f77965dd36001cd Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 30 12:06:24 2017 -0400 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. Improve the overview/summary comment in external-app-blocker.js. --- src/components/external-app-blocker.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index ca86580..1f88fc7 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -8,9 +8,8 @@ * due to Firefox Bug https://bugzilla.mozilla.org/show_bug.cgi?id=440892 * * An instance of this module is created each time the browser starts to - * download a file that may be opened by another or application and when - * an external application may be invoked to handle an URL (e.g., when the - * user clicks on a mailto: URL). + * download a file and when an external application may be invoked to + * handle an URL (e.g., when the user clicks on a mailto: URL). *************************************************************************/ const Cc = Components.classes;

1 0

[torbutton/maint-1.9.7] fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog.
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 0144a6719ccb45ec7727454880c4350e40a418d5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 20 17:11:53 2017 -0400 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. For compatibility with recent changes to our browser patch, change the external app blocker module so it implements the new nsIHelperAppWarningDialog interface. Since the external app blocker module is no longer a service, split the drag and drop filter into a separate component (which remains a service). --- src/chrome.manifest | 7 +- src/components/dragDropFilter.js | 86 +++++++++++++++++ src/components/external-app-blocker.js | 169 ++++++++++++++++----------------- 3 files changed, 175 insertions(+), 87 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index 272401b..65f55a9 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -143,8 +143,11 @@ skin torbutton classic/1.0 chrome/skin/ style chrome://global/content/customizeToolbar.xul chrome://torbutton/skin/torbutton.css # Firefox 4-style component registration +component {f605ec27-d867-44b5-ad97-2a29276642c3} components/dragDropFilter.js +contract @torproject.org/torbutton-dragDropFilter;1 {f605ec27-d867-44b5-ad97-2a29276642c3} + component {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} components/external-app-blocker.js -contract @torproject.org/torbutton-extAppBlockerService;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} +contract @torproject.org/torbutton-extAppBlocker;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} component {06322def-6fde-4c06-aef6-47ae8e799629} components/startup-observer.js contract @torproject.org/startup-observer;1 {06322def-6fde-4c06-aef6-47ae8e799629} @@ -165,4 +168,4 @@ category profile-after-change CookieJarSelector @torproject.org/cookie-jar-selec category profile-after-change StartupObserver @torproject.org/startup-observer;1 category profile-after-change DomainIsolator @torproject.org/domain-isolator;1 -category profile-after-change ExtAppBlockerService @torproject.org/torbutton-extAppBlockerService;1 +category profile-after-change DragDropFilter @torproject.org/torbutton-dragDropFilter;1 diff --git a/src/components/dragDropFilter.js b/src/components/dragDropFilter.js new file mode 100644 index 0000000..22dde86 --- /dev/null +++ b/src/components/dragDropFilter.js @@ -0,0 +1,86 @@ +/************************************************************************* + * Drag and Drop Handler. + * + * Implements an observer that filters drag events to prevent OS + * access to URLs (a potential proxy bypass vector). + *************************************************************************/ + +const Cc = Components.classes; +const Ci = Components.interfaces; +const Cu = Components.utils; + +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); + +// Module specific constants +const kMODULE_NAME = "Torbutton Drag and Drop Handler"; +const kCONTRACT_ID = "@torproject.org/torbutton-dragDropFilter;1"; +const kMODULE_CID = Components.ID("f605ec27-d867-44b5-ad97-2a29276642c3"); + +const kInterfaces = [Ci.nsIObserver, Ci.nsIClassInfo]; + +function DragDropFilter() { + this.logger = Cc["@torproject.org/torbutton-logger;1"] + .getService(Ci.nsISupports).wrappedJSObject; + this.logger.log(3, "Component Load 0: New DragDropFilter."); + + try { + var observerService = Cc["@mozilla.org/observer-service;1"]. + getService(Ci.nsIObserverService); + observerService.addObserver(this, "on-datatransfer-available", false); + } catch(e) { + this.logger.log(5, "Failed to register drag observer"); + } +} + +DragDropFilter.prototype = +{ + QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]), + + // make this an nsIClassInfo object + flags: Ci.nsIClassInfo.DOM_OBJECT, + classDescription: kMODULE_NAME, + contractID: kCONTRACT_ID, + classID: kMODULE_CID, + + // method of nsIClassInfo + getInterfaces: function(count) { + count.value = kInterfaces.length; + return kInterfaces; + }, + + // method of nsIClassInfo + getHelperForLanguage: function(count) { return null; }, + + // method of nsIObserver + observe: function(subject, topic, data) { + if (topic == "on-datatransfer-available") { + this.logger.log(3, "The DataTransfer is available"); + return this.filterDataTransferURLs(subject); + } + }, + + filterDataTransferURLs: function(aDataTransfer) { + var types = null; + var type = ""; + var count = aDataTransfer.mozItemCount; + var len = 0; + for (var i = 0; i < count; ++i) { + this.logger.log(3, "Inspecting the data transfer: " + i); + types = aDataTransfer.mozTypesAt(i); + len = types.length; + for (var j = 0; j < len; ++j) { + type = types[j]; + this.logger.log(3, "Type is: " + type); + if (type == "text/x-moz-url" || + type == "text/x-moz-url-data" || + type == "text/uri-list" || + type == "application/x-moz-file-promise-url") { + aDataTransfer.clearData(type); + this.logger.log(3, "Removing " + type); + } + } + } + } +}; + +var NSGetFactory = XPCOMUtils.generateNSGetFactory([DragDropFilter]); diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index e56fed3..ca86580 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -7,19 +7,24 @@ * Handles displaying confirmation dialogs for external apps and protocols * due to Firefox Bug https://bugzilla.mozilla.org/show_bug.cgi?id=440892 * - * Also implements an observer that filters drag events to prevent OS - * access to URLs (a potential proxy bypass vector). + * An instance of this module is created each time the browser starts to + * download a file that may be opened by another or application and when + * an external application may be invoked to handle an URL (e.g., when the + * user clicks on a mailto: URL). *************************************************************************/ const Cc = Components.classes; const Ci = Components.interfaces; +const Cr = Components.results; const Cu = Components.utils; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +Cu.import("resource://gre/modules/Services.jsm"); +Cu.import("resource://gre/modules/SharedPromptUtils.jsm"); // Module specific constants const kMODULE_NAME = "Torbutton External App Handler"; -const kCONTRACT_ID = "@torproject.org/torbutton-extAppBlockerService;1"; +const kCONTRACT_ID = "@torproject.org/torbutton-extAppBlocker;1"; const kMODULE_CID = Components.ID("3da0269f-fc29-4e9e-a678-c3b1cafcf13f"); const kInterfaces = [Ci.nsIObserver, Ci.nsIClassInfo]; @@ -28,23 +33,14 @@ function ExternalAppBlocker() { this.logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Ci.nsISupports).wrappedJSObject; this.logger.log(3, "Component Load 0: New ExternalAppBlocker."); - - this._prefs = Cc["@mozilla.org/preferences-service;1"] - .getService(Ci.nsIPrefBranch); - - try { - var observerService = Cc["@mozilla.org/observer-service;1"]. - getService(Ci.nsIObserverService); - observerService.addObserver(this, "external-app-requested", false); - observerService.addObserver(this, "on-datatransfer-available", false); - } catch(e) { - this.logger.log(5, "Failed to register external app observer or drag observer"); - } } ExternalAppBlocker.prototype = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver]), + _helperAppLauncher: undefined, + + QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports, Ci.nsIObserver, + Ci.nsIHelperAppWarningDialog]), // make this an nsIClassInfo object flags: Ci.nsIClassInfo.DOM_OBJECT, @@ -58,83 +54,86 @@ ExternalAppBlocker.prototype = return kInterfaces; }, - // method of nsIClassInfo + // method of nsIClassInfo getHelperForLanguage: function(count) { return null; }, - // Returns true if launch should proceed. - _confirmLaunch: function() { - if (!this._prefs.getBoolPref("extensions.torbutton.launch_warning")) { - return true; - } - - var wm = Cc["@mozilla.org/appshell/window-mediator;1"] - .getService(Ci.nsIWindowMediator); - var chrome = wm.getMostRecentWindow("navigator:browser"); - - var prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"] - .getService(Ci.nsIPromptService); - var flags = prompts.BUTTON_POS_0 * prompts.BUTTON_TITLE_IS_STRING + - prompts.BUTTON_POS_1 * prompts.BUTTON_TITLE_IS_STRING + - prompts.BUTTON_DELAY_ENABLE + - prompts.BUTTON_POS_1_DEFAULT; - - var title = chrome.torbutton_get_property_string("torbutton.popup.external.title"); - var app = chrome.torbutton_get_property_string("torbutton.popup.external.app"); - var note = chrome.torbutton_get_property_string("torbutton.popup.external.note"); - var suggest = chrome.torbutton_get_property_string("torbutton.popup.external.suggest"); - var launch = chrome.torbutton_get_property_string("torbutton.popup.launch"); - var cancel = chrome.torbutton_get_property_string("torbutton.popup.cancel"); - var dontask = chrome.torbutton_get_property_string("torbutton.popup.dontask"); - - var check = {value: false}; - var result = prompts.confirmEx(chrome, title, app+note+suggest+" ", - flags, launch, cancel, "", dontask, check); - - if (check.value) { - this._prefs.setBoolPref("extensions.torbutton.launch_warning", false); + // method of nsIHelperAppWarningDialog + maybeShow: function(aLauncher, aWindowContext) + { + // Hold a reference to the object that called this component. This is + // important not just because we need to later invoke the + // continueRequest() or cancelRequest() callback on aLauncher, but also + // so that the launcher object (which is a reference counted object) is + // not released too soon. + this._helperAppLauncher = aLauncher; + + if (!Services.prefs.getBoolPref("extensions.torbutton.launch_warning")) { + this._helperAppLauncher.continueRequest(); + return; } - return (0 == result); - }, - - observe: function(subject, topic, data) { - if (topic == "external-app-requested") { - this.logger.log(3, "External app requested"); - // subject.data is true if the launch should be canceled. - if ((subject instanceof Ci.nsISupportsPRBool) - && !subject.data /* not canceled already */ - && !this._confirmLaunch()) { - subject.data = true; // The user said to cancel the launch. - } - } else if (topic == "on-datatransfer-available") { - this.logger.log(3, "The DataTransfer is available"); - return this.filterDataTransferURLs(subject); - } + this._showPrompt(aWindowContext); }, - filterDataTransferURLs: function(aDataTransfer) { - var types = null; - var type = ""; - var count = aDataTransfer.mozItemCount; - var len = 0; - for (var i = 0; i < count; ++i) { - this.logger.log(3, "Inspecting the data transfer: " + i); - types = aDataTransfer.mozTypesAt(i); - len = types.length; - for (var j = 0; j < len; ++j) { - type = types[j]; - this.logger.log(3, "Type is: " + type); - if (type == "text/x-moz-url" || - type == "text/x-moz-url-data" || - type == "text/uri-list" || - type == "application/x-moz-file-promise-url") { - aDataTransfer.clearData(type); - this.logger.log(3, "Removing " + type); - } - } + /* + * The _showPrompt() implementation uses some XUL and JS that is part of the + * browser's confirmEx() implementation. Specifically, _showPrompt() depends + * on chrome://global/content/commonDialog.xul as well as some of the code + * in resource://gre/modules/SharedPromptUtils.jsm. + */ + _showPrompt: function(aWindowContext) { + let parentWin; + try { + parentWin = aWindowContext.getInterface(Ci.nsIDOMWindow); + } catch (e) { + parentWin = Services.wm.getMostRecentWindow("navigator:browser"); } - } + let title = parentWin.torbutton_get_property_string("torbutton.popup.external.title"); + let app = parentWin.torbutton_get_property_string("torbutton.popup.external.app"); + let note = parentWin.torbutton_get_property_string("torbutton.popup.external.note"); + let suggest = parentWin.torbutton_get_property_string("torbutton.popup.external.suggest"); + let launch = parentWin.torbutton_get_property_string("torbutton.popup.launch"); + let cancel = parentWin.torbutton_get_property_string("torbutton.popup.cancel"); + let dontask = parentWin.torbutton_get_property_string("torbutton.popup.dontask"); + + let args = { + promptType: "confirmEx", + title: title, + text: app+note+suggest+" ", + checkLabel: dontask, + checked: false, + ok: false, + button0Label: launch, + button1Label: cancel, + defaultButtonNum: 1, // Cancel + buttonNumClicked: 1, // Cancel + enableDelay: true, + }; + + let propBag = PromptUtils.objectToPropBag(args); + let uri = "chrome://global/content/commonDialog.xul"; + let promptWin = Services.ww.openWindow(parentWin, uri, "_blank", + "centerscreen,chrome,titlebar", propBag); + promptWin.addEventListener("load", aEvent => { + promptWin.addEventListener("unload", aEvent => { + PromptUtils.propBagToObject(propBag, args); + + if (0 == args.buttonNumClicked) { + // Save the checkbox value and tell the browser's external helper app + // module about the user's choice. + if (args.checked) { + Services.prefs.setBoolPref("extensions.torbutton.launch_warning", + false); + } + + this._helperAppLauncher.continueRequest(); + } else { + this._helperAppLauncher.cancelRequest(Cr.NS_BINDING_ABORTED); + } + }, false); + }, false); + }, }; var NSGetFactory = XPCOMUtils.generateNSGetFactory([ExternalAppBlocker]);

1 0

[torbutton/master] Translations update
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 4f33131f3e1b110511d594e68b42757a84c1b4fe Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 17 11:15:10 2017 +0000 Translations update --- src/chrome/content/torbutton.js | 2 +- src/chrome/locale/de/aboutTor.properties | 16 ++++++++-------- src/chrome/locale/es/aboutTor.properties | 2 +- src/chrome/locale/fr/aboutTor.properties | 2 +- src/chrome/locale/it/aboutTor.properties | 8 ++++---- src/chrome/locale/nl/aboutTor.properties | 8 ++++---- src/chrome/locale/pl/aboutTor.properties | 16 ++++++++-------- src/chrome/locale/pt-BR/aboutTor.properties | 2 +- src/chrome/locale/ru/aboutTor.properties | 10 +++++----- src/chrome/locale/ru/torbutton.dtd | 4 ++-- src/chrome/locale/sv/aboutTor.properties | 16 ++++++++-------- src/chrome/locale/tr/aboutTor.properties | 2 +- 12 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 955f8eb..9e18adb 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2346,7 +2346,7 @@ function torbutton_update_noscript_button() // Update every window's NoScript status... while (browserEnumerator.hasMoreElements()) { let win = browserEnumerator.getNext(); - win.noscriptOverlay._syncUINow(); + //win.noscriptOverlay._syncUINow(); } torbutton_log(3, 'Updated NoScript status for security settings'); } catch (e) { diff --git a/src/chrome/locale/de/aboutTor.properties b/src/chrome/locale/de/aboutTor.properties index 3233797..9d2b0df 100644 --- a/src/chrome/locale/de/aboutTor.properties +++ b/src/chrome/locale/de/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Jetzt spenden! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: Digitalen Widerstand stärken +aboutTor.donationBanner.mozilla=Spenden Sie heute und Mozilla wird Ihr Geschenk anpassen -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline1=Schützt seit 2006 Journalisten, Whistleblower & Aktivisten +aboutTor.donationBanner.tagline2=Weltweite Vernetzungsfreiheit +aboutTor.donationBanner.tagline3=Freiheit online +aboutTor.donationBanner.tagline4=Fördert weltweit freie Meinungsäußerung. +aboutTor.donationBanner.tagline5=Schützt täglich die Privatsphäre von Millionen. diff --git a/src/chrome/locale/es/aboutTor.properties b/src/chrome/locale/es/aboutTor.properties index 01cd311..f1e2d59 100644 --- a/src/chrome/locale/es/aboutTor.properties +++ b/src/chrome/locale/es/aboutTor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/?kl=-es aboutTor.donationBanner.donate=¡Dona ahora! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: Impulsando la resistencia digital aboutTor.donationBanner.mozilla=¡Dona hoy y Mozilla te la igualará! aboutTor.donationBanner.tagline1=Protegiendo a periodistas, informantes, y activistas desde 2006 diff --git a/src/chrome/locale/fr/aboutTor.properties b/src/chrome/locale/fr/aboutTor.properties index bdaedb7..cd844af 100644 --- a/src/chrome/locale/fr/aboutTor.properties +++ b/src/chrome/locale/fr/aboutTor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Faites un don maintenant ! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor : la puissance de la résistance numérique aboutTor.donationBanner.mozilla=Faites un don aujourd'hui et Mozilla fera un don équivalent ! aboutTor.donationBanner.tagline1=Nous protégeons journalistes, lanceurs d'alerte et activistes depuis 2006 diff --git a/src/chrome/locale/it/aboutTor.properties b/src/chrome/locale/it/aboutTor.properties index 8d5b3a7..e25f90a 100644 --- a/src/chrome/locale/it/aboutTor.properties +++ b/src/chrome/locale/it/aboutTor.properties @@ -10,11 +10,11 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Dona adesso! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: alimentiamo la resistenza digitale +aboutTor.donationBanner.mozilla=Dona oggi e Mozilla ricambierà il regalo! aboutTor.donationBanner.tagline1=Proteggiamo giornalisti, informatori e attivisti dal 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide +aboutTor.donationBanner.tagline2=Rendiamo la rete libera nel mondo aboutTor.donationBanner.tagline3=Libertà online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide +aboutTor.donationBanner.tagline4=Promuoviamo la libertà di parola nel mondo aboutTor.donationBanner.tagline5=Proteggiamo la privacy di milioni di persone ogni giorno diff --git a/src/chrome/locale/nl/aboutTor.properties b/src/chrome/locale/nl/aboutTor.properties index ee9cc49..521f96f 100644 --- a/src/chrome/locale/nl/aboutTor.properties +++ b/src/chrome/locale/nl/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Doneer nu! aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline2=Wereldwijde Netwerk Vrijheid +aboutTor.donationBanner.tagline3=Online Vrijheid aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline5=Beveiligt de privacy van miljoenen gebruikers per dag diff --git a/src/chrome/locale/pl/aboutTor.properties b/src/chrome/locale/pl/aboutTor.properties index dc12b3a..b6e1bba 100644 --- a/src/chrome/locale/pl/aboutTor.properties +++ b/src/chrome/locale/pl/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Wesprzyj teraz! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: Zasila Odporność Cyfrową +aboutTor.donationBanner.mozilla=Daj dzisiaj i Mozilla dopasuje Twój prezent! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline1=Chroni dziennikarzy, informatorów i aktywistów od 2006 +aboutTor.donationBanner.tagline2=Wolność dla sieci na całym świecie +aboutTor.donationBanner.tagline3=Wolność Online +aboutTor.donationBanner.tagline4=Wspieranie ekspresji na całym świecie +aboutTor.donationBanner.tagline5=Ochrona prywatności milionów każdego dnia diff --git a/src/chrome/locale/pt-BR/aboutTor.properties b/src/chrome/locale/pt-BR/aboutTor.properties index 84a283a..ca749aa 100644 --- a/src/chrome/locale/pt-BR/aboutTor.properties +++ b/src/chrome/locale/pt-BR/aboutTor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Faça uma Doação Agora! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: Desligando a Resistência Digital aboutTor.donationBanner.mozilla=Faça uma doação hoje e a Mozilla vai doará em dobro! aboutTor.donationBanner.tagline1=Protegendo Jornalistas, Whistleblowers e Ativistas desde 2006 diff --git a/src/chrome/locale/ru/aboutTor.properties b/src/chrome/locale/ru/aboutTor.properties index 695436a..527d579 100644 --- a/src/chrome/locale/ru/aboutTor.properties +++ b/src/chrome/locale/ru/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Пожертвовать! aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online +aboutTor.donationBanner.tagline1=Защита журналистов, информаторов и активистов с 2006 года +aboutTor.donationBanner.tagline2=Свобода сети во всём мире +aboutTor.donationBanner.tagline3=Свобода в сети aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline5=Защита конфиденциальности миллионов каждый день diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 839bfca..fb05620 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -27,10 +27,10 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Не защищать новые куки-файлы"> <!ENTITY torbutton.prefs.restrict_thirdparty "Блокировать сторонние куки-файлы и другие данные слежения"> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Оставьте флажок напротив этой опции отмеченным, чтобы защитить многие функции обозревателя от элементов отслеживания ваших действий во время серфинга в сети. Модифицированные компоненты включают в себя ссылки на блобы, транслируемые каналы, кэш браузера, файлы куки, значки, заголовки аутентификации HTTP, ссылки предпросмотра, локальное хранилище, ссылки на медиаконтент, запросы OCSP, SharedWorkers и объявления сессии TLS."> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Оставьте флажок напротив этой функции отмеченным, чтобы защитить многие функции обозревателя от элементов отслеживания ваших действий во время серфинга в сети. Модифицированные компоненты включают в себя ссылки на блобы, транслируемые каналы, кэш браузера, файлы куки, значки, заголовки аутентификации HTTP, ссылки предпросмотра, локальное хранилище, ссылки на медиаконтент, запросы OCSP, SharedWorkers и объявления сессии TLS."> <!ENTITY torbutton.prefs.resist_fingerprinting "Изменить сведения, отличающие вас от других пользователей Tor Browser"> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> -<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities."> +<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Оставьте флажок напротив этой функции отмеченным, чтобы скрыть от веб-узлов вещи , которые могут быть уникальными для вас, включая производительность компьютера, раскладку клавиатуры, язык, расположение и список установленных плагинов, состояние сети, ориентацию и размер экрана , значения масштабирования для конкретных узлов, поддерживаемые типы файлов, системные цвета и возможности WebGL."> <!ENTITY torbutton.prefs.sec_caption "Уровень безопасности"> <!ENTITY torbutton.prefs.sec_caption_tooltip "Ползунок безопасности позволяет вам запретить некоторые особенности обозревателя, которые могут сделать ваш браузер более уязвимым к попыткам взлома."> <!ENTITY torbutton.prefs.sec_low "Низкий (по умолчанию)"> diff --git a/src/chrome/locale/sv/aboutTor.properties b/src/chrome/locale/sv/aboutTor.properties index 64b0ed9..016ea20 100644 --- a/src/chrome/locale/sv/aboutTor.properties +++ b/src/chrome/locale/sv/aboutTor.properties @@ -8,13 +8,13 @@ aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html # The following string is a link which replaces %2$S above. aboutTor.searchDDG.search.link=https://duckduckgo.com/ -aboutTor.donationBanner.donate=Donate Now! +aboutTor.donationBanner.donate=Donera nu! -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance -aboutTor.donationBanner.mozilla=Give today and Mozilla will match your gift! +aboutTor.donationBanner.slogan=Tor: Kraftfull digital resistans +aboutTor.donationBanner.mozilla=Ge idag och Mozilla kommer att matcha din gåva! -aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activists Since 2006 -aboutTor.donationBanner.tagline2=Networking Freedom Worldwide -aboutTor.donationBanner.tagline3=Freedom Online -aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide -aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day +aboutTor.donationBanner.tagline1=Skyddar journalister, whistleblowers och aktivister sedan 2006 +aboutTor.donationBanner.tagline2=Nätverksfrihet över hela världen +aboutTor.donationBanner.tagline3=Frihet på nåtet +aboutTor.donationBanner.tagline4=Främja yttrandefriheten över hela världen +aboutTor.donationBanner.tagline5=Skydda integriteten av miljoner varje dag diff --git a/src/chrome/locale/tr/aboutTor.properties b/src/chrome/locale/tr/aboutTor.properties index 3b7a7d6..e07e35d 100644 --- a/src/chrome/locale/tr/aboutTor.properties +++ b/src/chrome/locale/tr/aboutTor.properties @@ -10,7 +10,7 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Bağış Yapın -aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance +aboutTor.donationBanner.slogan=Tor: Dijital Direnişi Güçlendiriyor aboutTor.donationBanner.mozilla=Destek olun ve Mozilla tarafından hediyenizin karşılığını alın! aboutTor.donationBanner.tagline1=2006 Yılından Beri Gazeteciler, Yolsuzlukları Açıklayanlar ve Aktivistler Korunuyor

1 0

[torbutton/master] Bug 23887: Update banner locales and Mozilla text
by gk＠torproject.org 17 Oct '17

17 Oct '17

commit 235da9c962e5e2b06ed7c73259d51d723433b5f0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Oct 16 23:09:56 2017 -0700 Bug 23887: Update banner locales and Mozilla text Also: change donation link to https://www.torproject.org/donate/donate-pdr-tbb-[locale] --- src/chrome/content/aboutTor/aboutTor.xhtml | 3 ++- src/chrome/content/aboutTor/donation_banner.js | 4 +++- src/chrome/skin/donation_banner.css | 23 ++++++++++++++++++++--- src/modules/donation-banner.js | 16 ++++++++++------ 4 files changed, 35 insertions(+), 11 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 367f9a6..248df11 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -37,8 +37,9 @@ window.addEventListener("pageshow", function() { <div id="banner-contents-container"> <div id="banner-tagline"><span></span></div> <div id="banner-slogan"><span></span></div> + <div id="banner-mozilla"><span></span></div> <a id="banner-donate-button-link" - href="https://www.torproject.org/donate/donate-tbb"> + href="https://www.torproject.org/donate/donate-pdr-tbb"> <div id="banner-donate-button"> <div id="banner-donate-button-inner"> <span></span> diff --git a/src/chrome/content/aboutTor/donation_banner.js b/src/chrome/content/aboutTor/donation_banner.js index 1c95822..391c28f 100644 --- a/src/chrome/content/aboutTor/donation_banner.js +++ b/src/chrome/content/aboutTor/donation_banner.js @@ -46,6 +46,7 @@ let avoidWidows = function (element) { let updateTextSizes = function () { fitTextInElement(sel("#banner-tagline")); fitTextInElement(sel("#banner-slogan")); + fitTextInElement(sel("#banner-mozilla")); fitTextInElement(sel("#banner-donate-button-inner")); avoidWidows(sel("#banner-tagline span")); }; @@ -54,10 +55,11 @@ let updateTextSizes = function () { let randomInteger = max => Math.floor(max * Math.random()); // The main donation banner function. -let runDonationBanner = function ({ taglines, slogan, donate, shortLocale }) { +let runDonationBanner = function ({ taglines, slogan, mozilla, donate, shortLocale }) { try { sel("#banner-tagline span").innerText = taglines[randomInteger(taglines.length)]; sel("#banner-slogan span").innerText = slogan; + sel("#banner-mozilla span").innerText = mozilla; let donateButtonText = sel("#banner-donate-button-inner span"); let rtl = window.getComputedStyle(donateButtonText).direction === "rtl"; donateButtonText.innerHTML = donate + " " + (rtl ? "◀" : "▶"); diff --git a/src/chrome/skin/donation_banner.css b/src/chrome/skin/donation_banner.css index 8580066..c91f0e5 100644 --- a/src/chrome/skin/donation_banner.css +++ b/src/chrome/skin/donation_banner.css @@ -58,8 +58,8 @@ right: 85px; } #banner-slogan { - align-items: start; - bottom: 0px; + align-items: center; + bottom: 30px; color: #f8f8a0; display: flex; font-family: monospace; @@ -68,13 +68,30 @@ position: absolute; right: 285px; text-align: start; - top: 100px; + top: 90px; white-space: nowrap; } #banner-slogan:-moz-dir(rtl) { left: 285px; right: 85px; } +#banner-mozilla { + align-items: center; + bottom: 5px; + color: white; + display: flex; + font-family: sans-serif; + left: 85px; + position: absolute; + right: 285px; + text-align: start; + top: 120px; + white-space: nowrap; +} +#banner-mozilla:-moz-dir(rtl) { + left: 285px; + right: 85px; +} #banner-donate-button { background-color: #13a513; border: 0px; diff --git a/src/modules/donation-banner.js b/src/modules/donation-banner.js index bb35e86..3a954e5 100644 --- a/src/modules/donation-banner.js +++ b/src/modules/donation-banner.js @@ -9,14 +9,17 @@ Cu.import("resource://gre/modules/Services.jsm"); const kBannerLocales = [ "bg", "da", + "de", "el", "en", "es", "fr", - "fr_CA", "is", "it", + "pt", "nb", + "ru", + "sv", "tr", ]; @@ -46,7 +49,7 @@ const gStringBundle = Services.strings.createBundle(kPropertiesURL); // Check if we should show the banner, depends on // browser locale, current date, and how many times // we have already shown the banner. -const shouldShowBanner = function ({ locale, shortLocale }) { +const shouldShowBanner = function (shortLocale) { try { // If our override test pref is true, then just show the banner regardless. if (Services.prefs.getBoolPref("extensions.torbutton.testBanner", false)) { @@ -58,7 +61,7 @@ const shouldShowBanner = function ({ locale, shortLocale }) { return false; } // Only show banner when we have that locale and if a donation redirect exists. - if (kBannerLocales.indexOf(locale) === -1 || + if (kBannerLocales.indexOf(shortLocale) === -1 || kDonationPageLocales.indexOf(shortLocale) === -1) { return false; } @@ -92,7 +95,7 @@ var bannerData = function () { // Read short locale. let locale = Services.prefs.getCharPref("general.useragent.locale"); let shortLocale = locale.match(/[a-zA-Z]+/)[0].toLowerCase(); - if (!shouldShowBanner({ locale, shortLocale })) { + if (!shouldShowBanner(shortLocale)) { return null; } // Load tag lines. @@ -102,10 +105,11 @@ var bannerData = function () { "aboutTor.donationBanner.tagline" + (index + 1)); taglines.push(tagline); } - // Read slogan and donate button text. + // Read slogan, mozilla, and donate button text. let slogan = gStringBundle.GetStringFromName("aboutTor.donationBanner.slogan"); + let mozilla = gStringBundle.GetStringFromName("aboutTor.donationBanner.mozilla"); let donate = gStringBundle.GetStringFromName("aboutTor.donationBanner.donate"); - return JSON.stringify({ taglines, slogan, donate, shortLocale }); + return JSON.stringify({ taglines, slogan, mozilla, donate, shortLocale }); }; // Export utility functions for external use.

1 0

[tor-browser/tor-browser-52.4.0esr-7.5-1] Revert "bug 23104 - Add a default line height compensation"
by gk＠torproject.org 05 Oct '17

05 Oct '17

commit 5117adf6b06bd2901144d15847b4cc902a94741a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Oct 5 12:08:28 2017 +0000 Revert "bug 23104 - Add a default line height compensation" This reverts commit 722fd293451de0859106949d64dc2cb16c22a780. Backing out due to #23701: We should make sure this defense only applies to content and not the browser chrome. --- layout/generic/ReflowInput.cpp | 6 ----- tbb-tests/mochitest.ini | 1 - tbb-tests/test_tor_bug23104.html | 51 ---------------------------------------- 3 files changed, 58 deletions(-) diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp index e219ae032cc6..42f4a24b5314 100644 --- a/layout/generic/ReflowInput.cpp +++ b/layout/generic/ReflowInput.cpp @@ -30,7 +30,6 @@ #include "CounterStyleManager.h" #include <algorithm> #include "mozilla/dom/HTMLInputElement.h" -#include "nsContentUtils.h" #ifdef DEBUG #undef NOISY_VERTICAL_ALIGN @@ -2769,11 +2768,6 @@ GetNormalLineHeight(nsFontMetrics* aFontMetrics) nscoord externalLeading = aFontMetrics->ExternalLeading(); nscoord internalLeading = aFontMetrics->InternalLeading(); nscoord emHeight = aFontMetrics->EmHeight(); - - if (nsContentUtils::ShouldResistFingerprinting()) { - return NSToCoordRound(emHeight * NORMAL_LINE_HEIGHT_FACTOR); - } - switch (GetNormalLineHeightCalcControl()) { case eIncludeExternalLeading: normalLineHeight = emHeight+ internalLeading + externalLeading; diff --git a/tbb-tests/mochitest.ini b/tbb-tests/mochitest.ini index fca972a51211..3d2e7c9db803 100644 --- a/tbb-tests/mochitest.ini +++ b/tbb-tests/mochitest.ini @@ -10,4 +10,3 @@ support-files = [test_tor_bug2875.html] [test_tor_bug4755.html] [test_tor_bug5856.html] -[test_tor_bug23104.html] diff --git a/tbb-tests/test_tor_bug23104.html b/tbb-tests/test_tor_bug23104.html deleted file mode 100644 index 77d7d190d7c8..000000000000 --- a/tbb-tests/test_tor_bug23104.html +++ /dev/null @@ -1,51 +0,0 @@ -<!DOCTYPE HTML> -<meta charset="UTF-8"> -<html> -<head> - <title>Test for Tor Bug #23104: CSS line-height reveals the platform Tor browser is running</title> - <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> - <script type="application/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> - <style type="text/css"> - span { - background-color: #000; - color: #fff; - font-size: 16.5px; - } - </style> -</head> -<body> -<span id="test1">Test1</span> -<span id="test2">كلمة</span> -<span id="test3">ação</span> -<script type="application/javascript;version=1.7"> - -let setPref = function* (key, value) { - return new Promise(function(resolve, reject) { - SpecialPowers.pushPrefEnv({"set": [[key, value]]}, resolve); - }); -} - -function getStyle(el, styleprop) { - el = document.getElementById(el); - return document.defaultView.getComputedStyle(el, null).getPropertyValue(styleprop); -} - -function validateElement(elementName, isFingerprintResistent) { - var fontSize = getStyle(elementName, 'font-size'); - var lineHeight = getStyle(elementName, 'line-height'); - var validationCb = isFingerprintResistent ? is : isnot; - validationCb(parseFloat(lineHeight), Math.ceil(parseFloat(fontSize)) * 1.2, 'Line Height validation'); -} - -add_task(function* () { - for (let resistFingerprintingValue of [true, false]) { - yield setPref("privacy.resistFingerprinting", resistFingerprintingValue); - for (let elementId of ['test1', 'test2', 'test3']) { - validateElement(elementId, resistFingerprintingValue); - } - } -}); - -</script> -</body> -</html>

1 0

[tor-browser-build/master] Bug 23585: fix build with runc version 1.0.0~rc2
by gk＠torproject.org 05 Oct '17

05 Oct '17

commit 8c4c05ddcfc30107b967b204d491523685460226 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 19 20:31:22 2017 +0200 Bug 23585: fix build with runc version 1.0.0~rc2 Some distributions are packaging runc version 1.0.0~rc2, which seems to be half between runc 0.1.1 and runc 1.0.0. This version requires the same command line parameters as version 1.0.0, however it requires a config.json in the same format as 0.1.1. The output from `runc --version` on 1.0.0~rc2 is: runc version spec: 1.0.0-rc2-dev So we add a var/runc_spec100 function which is true when the runc version spec is exactly 1.0.0 (as returned by runc stable 1.0.x releases), and use it in projects/common/runc-config.json. --- projects/common/runc-config.json | 6 +++--- rbm.conf | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/projects/common/runc-config.json b/projects/common/runc-config.json index a4386c6..7a88805 100644 --- a/projects/common/runc-config.json +++ b/projects/common/runc-config.json @@ -1,5 +1,5 @@ { - "ociVersion": "1.0.0[% IF !c("var_p/runc100") %]-rc1[% END %]", + "ociVersion": "1.0.0[% IF !c("var_p/runc_spec100") %]-rc1[% END %]", "platform": { "os": "linux", [% IF c("var/container/arch") == 'i386' -%] @@ -22,7 +22,7 @@ "TERM=xterm" ], "cwd": "/", -[% IF c("var_p/runc100") -%] +[% IF c("var_p/runc_spec100") -%] "capabilities": { "bounding": [ "CAP_AUDIT_WRITE", @@ -250,7 +250,7 @@ "/proc/kcore", "/proc/latency_stats", "/proc/timer_stats", -[% IF c("var_p/runc100") -%] +[% IF c("var_p/runc_spec100") -%] "/proc/timer_list", "/sys/firmware", [% END -%] diff --git a/rbm.conf b/rbm.conf index 0b0193d..c433f00 100644 --- a/rbm.conf +++ b/rbm.conf @@ -379,5 +379,11 @@ ENV: my ($out) = capture_exec('sudo', 'runc', '--version'); return !($out =~ m/^runc version 0.1.1/); }, + # runc_spec100 is true if runc spec is exactly 1.0.0 + # We will need to update this when there is a new spec version available + runc_spec100 => sub { + my ($out) = capture_exec('sudo', 'runc', '--version'); + return $out =~ m/^runc version spec: 1\.0\.0$/; + }, }, )

1 0

[tor-browser/tor-browser-52.4.0esr-7.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 04 Oct '17

04 Oct '17

commit b1c4718f8907e2ecae4d47e3ca83ba5077974e5b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 28 13:59:13 2017 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 16c23be0d65a..444c9f39b02a 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -180,13 +180,13 @@ pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API // Third party stuff +pref("privacy.firstparty.isolate", true); // Always enforce first party isolation pref("network.cookie.cookieBehavior", 1); pref("security.enable_tls_session_tickets", false); pref("network.http.spdy.enabled", false); // Stores state and may have keepalive issues (both fixable) pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case pref("network.http.spdy.enabled.v3-1", false); // Seems redundant, but just in case -pref("privacy.firstparty.isolate", true); // Always enforce first party isolation pref("network.http.spdy.enabled.http2", false); // Temporarily disabled pending implementation review pref("network.http.spdy.enabled.http2draft", false); // Temporarily disabled pending implementation review pref("network.predictor.enabled", false); // Temporarily disabled. See https://bugs.torproject.org/16633

1 0

[tor-browser/tor-browser-52.4.0esr-7.5-1] Bug 13398: at startup, browser gleans user FULL NAME (real name, given name) from O/S
by gk＠torproject.org 04 Oct '17

04 Oct '17

commit e3b99866dbdc29a2949d0a53806b99a94f34cc73 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Sep 29 15:35:31 2017 -0700 Bug 13398: at startup, browser gleans user FULL NAME (real name, given name) from O/S ifdef'd out offending code in each platform based on existance of TOR_BROWSER_VERSION and return empty string instead. --- toolkit/components/startup/nsUserInfoMac.mm | 24 ++++++++++++++++++++---- toolkit/components/startup/nsUserInfoUnix.cpp | 20 ++++++++++++++++++++ toolkit/components/startup/nsUserInfoWin.cpp | 22 ++++++++++++++++++++-- 3 files changed, 60 insertions(+), 6 deletions(-) diff --git a/toolkit/components/startup/nsUserInfoMac.mm b/toolkit/components/startup/nsUserInfoMac.mm index 1895cf177353..175e9637c422 100644 --- a/toolkit/components/startup/nsUserInfoMac.mm +++ b/toolkit/components/startup/nsUserInfoMac.mm @@ -19,11 +19,14 @@ NS_IMETHODIMP nsUserInfo::GetFullname(char16_t **aFullname) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT - +#ifndef TOR_BROWSER_VERSION NS_ConvertUTF8toUTF16 fullName([NSFullUserName() UTF8String]); *aFullname = ToNewUnicode(fullName); return NS_OK; - +#else + *aFullname = ToNewUnicode(NS_LITERAL_STRING("")); + return *aFullname ? NS_OK : NS_ERROR_FAILURE; +#endif NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT } @@ -31,11 +34,14 @@ NS_IMETHODIMP nsUserInfo::GetUsername(char **aUsername) { NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT - +#ifndef TOR_BROWSER_VERSION nsAutoCString username([NSUserName() UTF8String]); *aUsername = ToNewCString(username); return NS_OK; - +#else + *aUsername = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aUsername ? NS_OK : NS_ERROR_FAILURE; +#endif NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT } @@ -63,15 +69,21 @@ nsUserInfo::GetPrimaryEmailAddress(nsCString &aEmailAddress) NS_IMETHODIMP nsUserInfo::GetEmailAddress(char **aEmailAddress) { +#ifndef TOR_BROWSER_VERSION nsAutoCString email; if (NS_SUCCEEDED(GetPrimaryEmailAddress(email))) *aEmailAddress = ToNewCString(email); return NS_OK; +#else + *aEmailAddress = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aEmailAddress ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP nsUserInfo::GetDomain(char **aDomain) { +#ifndef TOR_BROWSER_VERSION nsAutoCString email; if (NS_SUCCEEDED(GetPrimaryEmailAddress(email))) { int32_t index = email.FindChar('@'); @@ -81,4 +93,8 @@ nsUserInfo::GetDomain(char **aDomain) } } return NS_OK; +#else + *aDomain = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aDomain ? NS_OK : NS_ERROR_FAILURE; +#endif } diff --git a/toolkit/components/startup/nsUserInfoUnix.cpp b/toolkit/components/startup/nsUserInfoUnix.cpp index 71bc46da2573..6c8b35443139 100644 --- a/toolkit/components/startup/nsUserInfoUnix.cpp +++ b/toolkit/components/startup/nsUserInfoUnix.cpp @@ -36,6 +36,7 @@ NS_IMPL_ISUPPORTS(nsUserInfo,nsIUserInfo) NS_IMETHODIMP nsUserInfo::GetFullname(char16_t **aFullname) { +#ifndef TOR_BROWSER_VERSION struct passwd *pw = nullptr; pw = getpwuid (geteuid()); @@ -76,11 +77,16 @@ nsUserInfo::GetFullname(char16_t **aFullname) return NS_OK; return NS_ERROR_FAILURE; +#else + *aFullname = ToNewUnicode(NS_LITERAL_STRING("")); + return *aFullname ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP nsUserInfo::GetUsername(char * *aUsername) { +#ifndef TOR_BROWSER_VERSION struct passwd *pw = nullptr; // is this portable? those are POSIX compliant calls, but I need to check @@ -95,11 +101,16 @@ nsUserInfo::GetUsername(char * *aUsername) *aUsername = strdup(pw->pw_name); return NS_OK; +#else + *aUsername = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aUsername ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP nsUserInfo::GetDomain(char * *aDomain) { +#ifndef TOR_BROWSER_VERSION nsresult rv = NS_ERROR_FAILURE; struct utsname buf; @@ -132,11 +143,16 @@ nsUserInfo::GetDomain(char * *aDomain) } return rv; +#else + *aDomain = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aDomain ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP nsUserInfo::GetEmailAddress(char * *aEmailAddress) { +#ifndef TOR_BROWSER_VERSION // use username + "@" + domain for the email address nsresult rv; @@ -163,5 +179,9 @@ nsUserInfo::GetEmailAddress(char * *aEmailAddress) *aEmailAddress = ToNewCString(emailAddress); return NS_OK; +#else + *aEmailAddress = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aEmailAddress ? NS_OK : NS_ERROR_FAILURE; +#endif } diff --git a/toolkit/components/startup/nsUserInfoWin.cpp b/toolkit/components/startup/nsUserInfoWin.cpp index b27a2c483b1c..04552d7310f9 100644 --- a/toolkit/components/startup/nsUserInfoWin.cpp +++ b/toolkit/components/startup/nsUserInfoWin.cpp @@ -30,6 +30,7 @@ nsUserInfo::GetUsername(char **aUsername) { NS_ENSURE_ARG_POINTER(aUsername); *aUsername = nullptr; +#ifndef TOR_BROWSER_VERSION // ULEN is the max username length as defined in lmcons.h wchar_t username[UNLEN +1]; @@ -39,6 +40,10 @@ nsUserInfo::GetUsername(char **aUsername) *aUsername = ToNewUTF8String(nsDependentString(username)); return (*aUsername) ? NS_OK : NS_ERROR_FAILURE; +#else + *aUsername = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aUsername ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP @@ -46,6 +51,7 @@ nsUserInfo::GetFullname(char16_t **aFullname) { NS_ENSURE_ARG_POINTER(aFullname); *aFullname = nullptr; +#ifndef TOR_BROWSER_VERSION wchar_t fullName[512]; DWORD size = mozilla::ArrayLength(fullName); @@ -91,6 +97,10 @@ nsUserInfo::GetFullname(char16_t **aFullname) } return (*aFullname) ? NS_OK : NS_ERROR_FAILURE; +#else + *aFullname = ToNewUnicode(NS_LITERAL_STRING("")); + return *aFullname ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP @@ -98,7 +108,7 @@ nsUserInfo::GetDomain(char **aDomain) { NS_ENSURE_ARG_POINTER(aDomain); *aDomain = nullptr; - +#ifndef TOR_BROWSER_VERSION const DWORD level = 100; LPBYTE info; NET_API_STATUS status = NetWkstaGetInfo(nullptr, level, &info); @@ -110,6 +120,10 @@ nsUserInfo::GetDomain(char **aDomain) } return (*aDomain) ? NS_OK : NS_ERROR_FAILURE; +#else + *aDomain = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aDomain ? NS_OK : NS_ERROR_FAILURE; +#endif } NS_IMETHODIMP @@ -117,7 +131,7 @@ nsUserInfo::GetEmailAddress(char **aEmailAddress) { NS_ENSURE_ARG_POINTER(aEmailAddress); *aEmailAddress = nullptr; - +#ifndef TOR_BROWSER_VERSION // RFC3696 says max length of an email address is 254 wchar_t emailAddress[255]; DWORD size = mozilla::ArrayLength(emailAddress); @@ -130,4 +144,8 @@ nsUserInfo::GetEmailAddress(char **aEmailAddress) *aEmailAddress = ToNewUTF8String(nsDependentString(emailAddress)); return (*aEmailAddress) ? NS_OK : NS_ERROR_FAILURE; +#else + *aEmailAddress = ToNewUTF8String(NS_LITERAL_STRING("")); + return *aEmailAddress ? NS_OK : NS_ERROR_FAILURE; +#endif }

1 0

[tor-browser-build/master] Fold in 7.0.6 changelog and update release date
by gk＠torproject.org 03 Oct '17

03 Oct '17

commit 36600281908287e26153315dc2a3e7aa2e6d06e3 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 3 06:25:42 2017 +0000 Fold in 7.0.6 changelog and update release date --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 430aa8c..56fcb64 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 7.5a5 -- September 27 2017 +Tor Browser 7.5a5 -- September 28 2017 * All Platforms * Update Firefox to 52.4.0esr * Update Tor to 0.3.2.1-alpha @@ -35,6 +35,20 @@ Tor Browser 7.5a5 -- September 27 2017 * All Platforms * Switch from gitian/tor-browser-bundle to rbm/tor-browser-build +Tor Browser 7.0.6 -- September 28 2017 + * All Platforms + * Update Firefox to 52.4.0esr + * Update Tor to 0.3.1.7 + * Update Torbutton to 1.9.7.7 + * Bug 22542: Security Settings window too small on macOS 10.12 (fixup) + * Bug 20375: Warn users after entering fullscreen mode + * Update HTTPS-Everywhere to 2017.9.12 + * Update NoScript to 5.0.10 + * Bug 21830: Copying large text from web console leaks to /tmp + * Bug 23393: Don't crash all tabs when closing one tab + * OS X + * Bug 23404: Add missing Noto Sans Buginese font to the macOS whitelist + Tor Browser 7.0.5 -- September 4 2017 * All Platforms * Update Torbutton to 1.9.7.6

1 0

[tor-browser-build/master] Bug 23384: install dma (lightweight mail transport agent) on build-sunet-a.torproject.net
by boklm＠torproject.org 02 Oct '17

02 Oct '17

commit 39722d6b59c200710025b899e5f544a69bbeb943 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 2 17:27:54 2017 +0200 Bug 23384: install dma (lightweight mail transport agent) on build-sunet-a.torproject.net --- tools/ansible/roles/mta/tasks/main.yml | 6 ++++++ tools/ansible/tbb-build.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/tools/ansible/roles/mta/tasks/main.yml b/tools/ansible/roles/mta/tasks/main.yml new file mode 100644 index 0000000..de469d8 --- /dev/null +++ b/tools/ansible/roles/mta/tasks/main.yml @@ -0,0 +1,6 @@ +--- + +- name: Install dma (DragonFly Mail Agent) + apt: + name: dma + state: present diff --git a/tools/ansible/tbb-build.yml b/tools/ansible/tbb-build.yml index e74e665..9f76b67 100644 --- a/tools/ansible/tbb-build.yml +++ b/tools/ansible/tbb-build.yml @@ -5,3 +5,4 @@ - role: tbb-builder - role: useful-packages - role: tbb-team + - role: mta

1 0

[tor-browser-build/master] Bug 23384: install and configure unattended-upgrades on build-sunet-a.torproject.net
by boklm＠torproject.org 02 Oct '17

02 Oct '17

commit fd97762cb0924eea137896425eab788daef6ca8d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 2 18:05:14 2017 +0200 Bug 23384: install and configure unattended-upgrades on build-sunet-a.torproject.net --- .../roles/unattended-upgrades/defaults/main.yml | 2 + .../roles/unattended-upgrades/tasks/main.yml | 18 +++++ .../unattended-upgrades/templates/20auto-upgrades | 2 + .../templates/50unattended-upgrades | 92 ++++++++++++++++++++++ tools/ansible/tbb-build.yml | 1 + 5 files changed, 115 insertions(+) diff --git a/tools/ansible/roles/unattended-upgrades/defaults/main.yml b/tools/ansible/roles/unattended-upgrades/defaults/main.yml new file mode 100644 index 0000000..f6351a7 --- /dev/null +++ b/tools/ansible/roles/unattended-upgrades/defaults/main.yml @@ -0,0 +1,2 @@ +--- +unattended_upgrade_mail: 'boklm(a)mars-attacks.org' diff --git a/tools/ansible/roles/unattended-upgrades/tasks/main.yml b/tools/ansible/roles/unattended-upgrades/tasks/main.yml new file mode 100644 index 0000000..de0892b --- /dev/null +++ b/tools/ansible/roles/unattended-upgrades/tasks/main.yml @@ -0,0 +1,18 @@ +--- + +- name: Install unattended-updates + apt: + name: unattended-upgrades + state: present + +- name: Install apt-listchanges + apt: + name: apt-listchanges + state: present + +- name: create /etc/apt/apt.conf.d/50unattended-upgrades + template: src=50unattended-upgrades dest=/etc/apt/apt.conf.d/50unattended-upgrades mode=0644 + +- name: create /etc/apt/apt.conf.d/20auto-upgrades + template: src=20auto-upgrades dest=/etc/apt/apt.conf.d/20auto-upgrades mode=0644 + diff --git a/tools/ansible/roles/unattended-upgrades/templates/20auto-upgrades b/tools/ansible/roles/unattended-upgrades/templates/20auto-upgrades new file mode 100644 index 0000000..8d6d7c8 --- /dev/null +++ b/tools/ansible/roles/unattended-upgrades/templates/20auto-upgrades @@ -0,0 +1,2 @@ +APT::Periodic::Update-Package-Lists "1"; +APT::Periodic::Unattended-Upgrade "1"; diff --git a/tools/ansible/roles/unattended-upgrades/templates/50unattended-upgrades b/tools/ansible/roles/unattended-upgrades/templates/50unattended-upgrades new file mode 100644 index 0000000..d4904ab --- /dev/null +++ b/tools/ansible/roles/unattended-upgrades/templates/50unattended-upgrades @@ -0,0 +1,92 @@ +// Unattended-Upgrade::Origins-Pattern controls which packages are +// upgraded. +// +// Lines below have the format format is "keyword=value,...". A +// package will be upgraded only if the values in its metadata match +// all the supplied keywords in a line. (In other words, omitted +// keywords are wild cards.) The keywords originate from the Release +// file, but several aliases are accepted. The accepted keywords are: +// a,archive,suite (eg, "stable") +// c,component (eg, "main", "crontrib", "non-free") +// l,label (eg, "Debian", "Debian-Security") +// o,origin (eg, "Debian", "Unofficial Multimedia Packages") +// n,codename (eg, "jessie", "jessie-updates") +// site (eg, "http.debian.net") +// The available values on the system are printed by the command +// "apt-cache policy", and can be debugged by running +// "unattended-upgrades -d" and looking at the log file. +// +// Within lines unattended-upgrades allows 2 macros whose values are +// derived from /etc/debian_version: +// ${distro_id} Installed origin. +// ${distro_codename} Installed codename (eg, "jessie") +Unattended-Upgrade::Origins-Pattern { + // Codename based matching: + // This will follow the migration of a release through different + // archives (e.g. from testing to stable and later oldstable). +// "o=Debian,n=jessie"; +// "o=Debian,n=jessie-updates"; +// "o=Debian,n=jessie-proposed-updates"; +// "o=Debian,n=jessie,l=Debian-Security"; + + // Archive or Suite based matching: + // Note that this will silently match a different release after + // migration to the specified archive (e.g. testing becomes the + // new stable). +// "o=Debian,a=stable"; +// "o=Debian,a=stable-updates"; +// "o=Debian,a=proposed-updates"; + "origin=Debian,codename=${distro_codename},label=Debian-Security"; +}; + +// List of packages to not update (regexp are supported) +Unattended-Upgrade::Package-Blacklist { +// "vim"; +// "libc6"; +// "libc6-dev"; +// "libc6-i686"; +}; + +// This option allows you to control if on a unclean dpkg exit +// unattended-upgrades will automatically run +// dpkg --force-confold --configure -a +// The default is true, to ensure updates keep getting installed +//Unattended-Upgrade::AutoFixInterruptedDpkg "false"; + +// Split the upgrade into the smallest possible chunks so that +// they can be interrupted with SIGUSR1. This makes the upgrade +// a bit slower but it has the benefit that shutdown while a upgrade +// is running is possible (with a small delay) +//Unattended-Upgrade::MinimalSteps "true"; + +// Install all unattended-upgrades when the machine is shuting down +// instead of doing it in the background while the machine is running +// This will (obviously) make shutdown slower +//Unattended-Upgrade::InstallOnShutdown "true"; + +// Send email to this address for problems or packages upgrades +// If empty or unset then no email is sent, make sure that you +// have a working mail setup on your system. A package that provides +// 'mailx' must be installed. E.g. "user(a)example.com" +Unattended-Upgrade::Mail "{{ unattended_upgrade_mail }}"; + +// Set this value to "true" to get emails only on errors. Default +// is to always send a mail if Unattended-Upgrade::Mail is set +//Unattended-Upgrade::MailOnlyOnError "true"; + +// Do automatic removal of new unused dependencies after the upgrade +// (equivalent to apt-get autoremove) +//Unattended-Upgrade::Remove-Unused-Dependencies "false"; + +// Automatically reboot *WITHOUT CONFIRMATION* if +// the file /var/run/reboot-required is found after the upgrade +//Unattended-Upgrade::Automatic-Reboot "false"; + +// If automatic reboot is enabled and needed, reboot at the specific +// time instead of immediately +// Default: "now" +//Unattended-Upgrade::Automatic-Reboot-Time "02:00"; + +// Use apt bandwidth limit feature, this example limits the download +// speed to 70kb/sec +//Acquire::http::Dl-Limit "70"; diff --git a/tools/ansible/tbb-build.yml b/tools/ansible/tbb-build.yml index 9f76b67..3d9f543 100644 --- a/tools/ansible/tbb-build.yml +++ b/tools/ansible/tbb-build.yml @@ -6,3 +6,4 @@ - role: useful-packages - role: tbb-team - role: mta + - role: unattended-upgrades

1 0