- tbb-commits - lists.torproject.org

[tor-browser-build/master] Release preparations for 8.5a2
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 467bb22b75375c673fc3ad58653d647c7650bfc9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 17:57:09 2018 +0000 Release preparations for 8.5a2 --- projects/firefox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 33 ++++++++++++++++++++++ projects/tor-browser/config | 4 +-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/torbutton/config | 2 +- rbm.conf | 4 +-- 7 files changed, 41 insertions(+), 8 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 8ebbd4f..aca6ce9 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # 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-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7c33834..60b61c0 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,36 @@ +Tor Browser 8.0.1 -- September 20 2018 + * All platforms + * Update Tor to 0.3.5.1-alpha + * Update Torbutton to 2.1 + * Bug 27097: Tor News signup banner + * Bug 27663: Add New Identity menuitem again + * Bug 27175: Add pref to allow users to persist custom noscript settings + * Bug 27760: Use new NoScript API for IPC and fix about:blank issue + * Bug 26624: Only block OBJECT on highest slider level + * Bug 26555: Don't show IP address for meek or snowflake + * Bug 27478: Torbutton icons for dark theme + * Bug 27506+14520: Move status version to upper left corner for RTL locales + * Bug 27558: Update the link to "Your Guard note may not change" text + * Bug 21263: Remove outdated information from the README + * Translations update + * Update Tor Launcher to 0.2.16.5 + * Bug 27469: Adapt Moat URLs + * Translations update + * Clean-up + * Update NoScript to 10.1.9.6 + * Bug 27763: Restrict Torbutton signing exemption to mobile + * Bug 26146: Spoof HTTP User-Agent header for desktop platforms + * Bug 27543: QR code is broken on web.whatsapp.com + * Bug 27264: Bookmark items are not visible on the boomark toolbar + * Bug 27535: Enable TLS 1.3 draft version + * Bug 27623: Use MOZILLA_OFFICIAL for our builds + * Windows: + * Bug 26381: about:tor page does not load on first start on Windows + * Linux: + * Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3 + * Bug 27552: Use bundled dir on CentOS/RHEL 6 + * Bug 26556: Fix broken Tor Browser icon path on Linux + Tor Browser 8.5a1 -- September 5 2018 * All platforms * Update Firefox to 60.2.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 85754ae..1647b77 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -67,9 +67,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: 68c3ef1b753210d376ab9b9c73fa053043f4f0f4cab219e317759fb32b104a27 + sha256sum: 336ae26d0a70688e6c2b3c14267c9e80f52f6f36c31f23b8242e0edae3666d42 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index c5ddc0a..9e00653 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.16.4 +version: 0.2.16.5 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index c1a3878..451c9bb 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.4.7-rc +version: 0.3.5.1-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/projects/torbutton/config b/projects/torbutton/config index f076b8f..a698691 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.0.6 +version: 2.1 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 cbbbf64..461849c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -15,10 +15,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5a1' + torbrowser_version: '8.5a2' torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.0a10 + - 8.5a1 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[torbutton/master] Release preparations for 2.1
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit cd85d9dd4e0a225688d1785ff4cb421abca1e16a Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 17:45:16 2018 +0000 Release preparations for 2.1 Changelog update and 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 562842e9..8bffbe8b 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +2.1 + * Bug 27175: Add pref to allow users to persist custom noscript settings + * Bug 27760: Use new NoScript API for IPC and fix about:blank issue + * Bug 21263: Remove outdated information from the README + 2.0.7 * Bug 27097: Tor News signup banner * Bug 27663: Add New Identity menuitem again diff --git a/src/install.rdf b/src/install.rdf index cd14a7dd..5df0f129 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>2.0.7</em:version> + <em:version>2.1</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit cfcf68c7ef27d33f072a405ef7e99815f5e34c1d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Sep 17 16:39:42 2018 -0400 Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. --- .mozconfig | 1 + .mozconfig-asan | 1 + .mozconfig-mac | 1 + .mozconfig-mingw | 1 + 4 files changed, 4 insertions(+) diff --git a/.mozconfig b/.mozconfig index 909f107f2948..b19e10a24940 100755 --- a/.mozconfig +++ b/.mozconfig @@ -3,6 +3,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-optimize diff --git a/.mozconfig-asan b/.mozconfig-asan index 914195971e6e..be11dcbd967a 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -15,6 +15,7 @@ export HOST_LDFLAGS="-ldl" mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-address-sanitizer diff --git a/.mozconfig-mac b/.mozconfig-mac index 540c5b375336..a9fbe7967ead 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -33,6 +33,7 @@ ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-application=browser diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 05dd4d6168a8..71494b6e1b78 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -7,6 +7,7 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug

1 0

[tor-browser-build/master] Bug 27623: Export MOZILLA_OFFICIAL during desktop builds
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit f49b8306354f68dcaf8efeec8a4bd8b5a8908e6b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Sep 18 09:29:55 2018 -0400 Bug 27623: Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. --- projects/firefox/mozconfig-linux-i686 | 1 + projects/firefox/mozconfig-linux-x86_64 | 1 + projects/firefox/mozconfig-osx-x86_64 | 1 + projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + 5 files changed, 5 insertions(+) diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index ec0adb9..ee5082a 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -3,6 +3,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 export CFLAGS=-m32 diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index 2e8e2fa..917e32c 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -3,6 +3,7 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-optimize diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 7ff17e1..5d56ad3 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -31,6 +31,7 @@ ac_add_options --with-macos-private-frameworks=$CROSS_PRIVATE_FRAMEWORKS mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-macos mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --enable-application=browser diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index a5e15f1..07e8851 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -10,6 +10,7 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index e7f857d..1665005 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -10,6 +10,7 @@ ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" mk_add_options MOZILLA_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 ac_add_options --disable-debug

1 0

[torbutton/master] Bug 21263: Remove outdated information from the README
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 02f3a9334acb1b1b72ee27c3e81013f8706f20d1 Author: traumschule <traumschuleriebau(a)riseup.net> Date: Sat Sep 15 15:43:15 2018 +0200 Bug 21263: Remove outdated information from the README --- README | 155 ++++++++--------------------------------------------------------- 1 file changed, 17 insertions(+), 138 deletions(-) diff --git a/README b/README index 3b3af2d6..f4dc12d4 100644 --- a/README +++ b/README @@ -1,144 +1,23 @@ -Torbutton is a 1-click way for Firefox users to enable or disable the -browser's use of Tor. It adds a panel to the statusbar that says "Tor -Enabled" (in green) or "Tor Disabled" (in red). The user may click on the -panel to toggle the status. If the user (or some other extension) changes -the proxy settings, the change is automatically reflected in the -statusbar. +Torbutton comes pre-installed with Tor Browser and we urge you not to change it. +We do not recommend to install it to Firefox because this is not a sufficient +way to surf anonymously. -Some users may prefer a toolbar button instead of a statusbar panel. Such -a button is included, and one adds it to the toolbar by right-clicking on -the desired toolbar, selecting "Customize...", and then dragging the -Torbutton icon onto the toolbar. There is an option in the preferences to -hide the statusbar panel (Tools->Extensions, select Torbutton, and click -on Preferences). +Torbutton guarantees that DNS requests are sent through the Tor instance that +comes with Tor Browser. You should not change the proxy settings. -Newer Firefoxes have the ability to send DNS resolves through the socks -proxy, and Torbutton will make use of this feature if it is available in -your version of Firefox. +It’s strongly discouraged to install new Add-ons in Tor Browser, because they +can compromise both your privacy and your security. Plus, Tor Browser already +comes installed with two add-ons — HTTPS Everywhere and NoScript — which give +you a lot of added protection. - FAQ +You can read more about it here: +https://www.torproject.org/projects/torbrowser/design/ -1. I can't click on links or hit reload after I toggle Tor! Why? +Also have a look at this page for already answered questions: +https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam/Support_discuss - Due to Firefox Bug 409737, pages can still open popups and perform - Javascript redirects and history access after Tor has been toggled. These - popups and redirects can be blocked, but unfortunately they are - indistinguishable from normal user interactions with the page (such as - clicking on links, opening them in new tabs/windows, or using the history - buttons), and so those are blocked as a side effect. Once that Firefox bug - is fixed, this degree of isolation will become optional (for people who do - not want to accidentally click on links and give away information via - referrers). A workaround is to right click on the link, and open it in a - new tab or window. The tab or window won't load automatically, but you can - hit enter in the URL bar, and it will begin loading. Hitting enter in the - URL bar will also reload the page without clicking the reload button. +For other issues you should know about have a look at this blog post: +https://blog.torproject.org/toggle-or-not-toggle-end-torbutton -2. My browser is in some weird state where nothing works right! - - Try to disable Tor by clicking on the button, and then open a new window. - If that doesn't fix the issue, go to the preferences page and hit 'Restore - Defaults'. This should reset the extension and Firefox to a known good - configuration. If you can manage to reproduce whatever issue gets your - Firefox wedged, please file details at the bug tracker. - -3. When I toggle Tor, my sites that use javascript stop working. Why? - - Javascript can do things like wait until you have disabled Tor before - trying to contact its source site, thus revealing your IP address. As - such, Torbutton must disable Javascript, Meta-Refresh tags, and certain - CSS behavior when Tor state changes from the state that was used to load a - given page. These features are re-enabled when Torbutton goes back into - the state that was used to load the page, but in some cases (particularly - with Javascript and CSS) it is sometimes not possible to fully recover - from the resulting errors, and the page is broken. Unfortunately, the only - thing you can do (and still remain safe from having your IP address leak) - is to reload the page when you toggle Tor, or just ensure you do all your - work in a page before switching tor state. - -4. When I use Tor, Firefox is no longer filling in logins/search boxes for - me. Why? - - Currently, this is tied to the "Block history writes during Tor" setting. - If you have enabled that setting, all formfill functionality (both saving - and reading) is disabled. If this bothers you, you can uncheck that - option, but both history and forms will be saved. To prevent history - disclosure attacks via Non-Tor usage, it is recommended you disable - Non-Tor history reads if you allow history writing during Tor. - -5. Which Firefox extensions should I avoid using? - - This is a tough one. There are thousands of Firefox extensions: making a - complete list of ones that are bad for anonymity is near impossible. - However, here are a few examples that should get you started as to what - sorts of behavior are dangerous. - - 1. StumbleUpon, et al These extensions will send all sorts of information - about the websites you visit to the stumbleupon servers, and correlate - this information with a unique identifier. This is obviously terrible - for your anonymity. More generally, any sort of extension that - requires registration, or even extensions that provide information - about websites you visit should be suspect. - 2. FoxyProxy While FoxyProxy is a nice idea in theory, in practice it is - impossible to configure securely for Tor usage without Torbutton. Like - all vanilla third party proxy plugins, the main risks are plugin - leakage and history disclosure, followed closely by cookie theft - by exit nodes and tracking by adservers (see the Torbutton - Adversary Model for more information). However, even with Torbutton - installed in tandem and always enabled, it is still very difficult - (though not impossible) to configure FoxyProxy securely. Since - FoxyProxy's 'Patterns' mode only applies to specific urls, and not to - an entire tab, setting FoxyProxy to only send specific sites through - Tor will still allow adservers to still learn your real IP. Worse, if - those sites use offsite logging services such as Google Analytics, you - may still end up in their logs with your real IP. Malicious exit nodes - can also cooperate with sites to inject images into pages that bypass - your filters. Setting FoxyProxy to only send certain URLs via Non-Tor - is much more viable, but be very careful with the filters you allow. - For example, something as simple as allowing *google* to go via - Non-Tor will still cause you to end up in all the logs of all websites - that use Google Analytics! See this question on the FoxyProxy FAQ - for more information. - 3. NoScript Torbutton currently mitigates all known anonymity issues with - Javascript. While it may be tempting to get better security by - disabling Javascript for certain sites, you are far better off with an - all-or-nothing approach. NoScript is exceedingly complicated, and has - many subtleties that can surprise even advanced users. For example, - addons.mozilla.org verifies extension integrity via Javascript over - https, but downloads them in the clear. Not adding it to your - whitelist effectively means you are pulling down unverified - extensions. Worse still, using NoScript can actually disable - protections that Torbutton itself provides via Javascript, yet still - allow malicious exit nodes to compromise your anonymity via the - default whitelist (which they can spoof to inject any script they - want). - -6. Which Firefox extensions do you recommend? - - 1. RefControl Mentioned above, this extension allows more - fine-grained referrer spoofing than Torbutton currently provides. It - should break less sites than Torbutton's referrer spoofing option. - 2. SafeCache If you use Tor excessively, and rarely disable it, you - probably want to install this extension to minimize the ability of - sites to store long term identifiers in your cache. This extension - applies same origin policy to the cache, so that elements are - retrieved from the cache only if they are fetched from a document in - the same origin domain as the cached element. - -7. Are there any other issues I should be concerned about? - - There is currently one known unfixed security issue with Torbutton: it is - possible to unmask the javascript hooks that wrap the Date object to - conceal your timezone in Firefox 2, and the timezone masking code does not - work at all on Firefox 3. We are working with the Firefox team to fix one - of Bug 399274 or Bug 419598 to address this. In the meantime, it - is possible to set the TZ environment variable to UTC to cause the browser - to use UTC as your timezone. Under Linux, you can add an export TZ=UTC to - the /usr/bin/firefox script, or edit your system bashrc to do the same. - Under Windows, you can set either a User or System Environment - Variable for TZ via My Computer's properties. In MacOS, the situation is - a lot more complicated, unfortunately. - - In addition, RSS readers such as Firefox Livemarks can perform periodic - fetches. Due to Firefox Bug 436250, there is no way to disable - Livemark fetches during Tor. This can be a problem if you have a lot of - custom Livemark urls that can give away information about your identity. +For a list of all torbutton announcements see +https://blog.torproject.org/category/tags/torbutton

1 0

[torbutton/master] Bug 27175: Add pref to allow users to persist custom noscript settings
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 461b828c70bb85501db99fdf077af71b69ef7e0a Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Sep 17 23:03:26 2018 -0700 Bug 27175: Add pref to allow users to persist custom noscript settings The pref is called "extensions.torbutton.noscript_persist". Warning! It is dangerous and could reveal what sites you have visited in the past. (We also use a pref named "extensions.torbutton.noscript_inited" to keep track of the first run.) --- src/defaults/preferences/preferences.js | 3 +++ src/modules/noscript-control.js | 31 +++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index fecf0e69..45b60ce8 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -48,6 +48,9 @@ pref("extensions.torbutton.prompt_torbrowser", true); pref("extensions.torbutton.confirm_plugins", true); pref("extensions.torbutton.confirm_newnym", true); +pref("extensions.torbutton.noscript_inited", false); +pref("extensions.torbutton.noscript_persist", false); + // Browser home page: pref("browser.startup.homepage", "chrome://torbutton/content/locale/non-localized.properties"); diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 621f2b7f..275f9dba 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -5,9 +5,10 @@ // ## Utilities const { utils: Cu } = Components; +const { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); const { LegacyExtensionContext } = Cu.import("resource://gre/modules/LegacyExtensionsUtils.jsm", {}); -const { bindPrefAndInit } = +const { bindPref } = Cu.import("resource://torbutton/modules/utils.js", {}); let logger = Components.classes["@torproject.org/torbutton-logger;1"] .getService(Components.interfaces.nsISupports).wrappedJSObject; @@ -128,14 +129,28 @@ var initialize = () => { // Wait for the first message from NoScript to arrive, and then // bind the security_slider pref to the NoScript settings. let messageListener = (a,b,c) => { - log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); - if (!["started", "pageshow"].includes(a.__meta.name)) { - return; + try { + log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); + if (!["started", "pageshow"].includes(a.__meta.name)) { + return; + } + extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); + let noscriptPersist = Services.prefs.getBoolPref("extensions.torbutton.noscript_persist", false); + let noscriptInited = Services.prefs.getBoolPref("extensions.torbutton.noscript_inited", false); + // Set the noscript safety level once if we have never run noscript + // before, or if we are not allowing noscript per-site settings to be + // persisted between browser sessions. Otherwise make sure that the + // security slider position, if changed, will rewrite the noscript + // settings. + bindPref("extensions.torbutton.security_slider", + sliderState => setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState)), + !noscriptPersist || !noscriptInited); + if (!noscriptInited) { + Services.prefs.setBoolPref("extensions.torbutton.noscript_inited", true); + } + } catch (e) { + log(5, e.message); } - extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); - bindPrefAndInit( - "extensions.torbutton.security_slider", - sliderState => setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState))); }; extensionContext.api.browser.runtime.onMessage.addListener(messageListener); log(3, "Listening for message from NoScript.");

1 0

[torbutton/master] Bug 27760: Fix NoScript IPC for about:blank by whitelisting messages
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 6016a170f0266cf926b7ff305796ba83cc353536 Author: Rusty Bird <rustybird(a)net-c.com> Date: Fri Sep 14 13:05:08 2018 +0000 Bug 27760: Fix NoScript IPC for about:blank by whitelisting messages If about:blank is the homepage (or has been passed as a command line parameter), NoScript will send a message named "fetchChildPolicy" _before_ "started". Torbutton would then send its "updateSettings" too soon, resulting in the dreaded error "Could not establish connection. Receiving end does not exist" (see bug 26520). Fix this by whitelisting the relevant messages from NoScript: "started" and also "pageshow" for a slightly more graceful failure mode in case Torbutton somehow misses NoScript startup. --- src/modules/noscript-control.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 934a4ef0..621f2b7f 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -129,6 +129,9 @@ var initialize = () => { // bind the security_slider pref to the NoScript settings. let messageListener = (a,b,c) => { log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); + if (!["started", "pageshow"].includes(a.__meta.name)) { + return; + } extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); bindPrefAndInit( "extensions.torbutton.security_slider",

1 0

[torbutton/master] Revert "Fix NoScript IPC for about:blank by whitelisting messages"
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit 0a7d19da90202e5d40851432400444dd6287ffd9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 10:46:58 2018 +0000 Revert "Fix NoScript IPC for about:blank by whitelisting messages" This reverts commit efdc83fec6244d5f2e4b8880fef010a6e362d9dc. --- src/modules/noscript-control.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index c1442950..934a4ef0 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -129,9 +129,6 @@ var initialize = () => { // bind the security_slider pref to the NoScript settings. let messageListener = (a,b,c) => { log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); - if (a._messageName != "started" && a._messageName != "pageshow") { - return; - } extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); bindPrefAndInit( "extensions.torbutton.security_slider",

1 0

[tor-browser-build/master] Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3
by boklm＠torproject.org 18 Sep '18

18 Sep '18

commit 768e2c34a7516ab6e4ce2389d76c45603c3aa2fe Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 18 09:45:03 2018 +0000 Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3 --- projects/tor-browser/build | 4 ++++ projects/tor-browser/config | 2 ++ projects/tor-browser/gtk3-settings.ini | 2 ++ 3 files changed, 8 insertions(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 4c228a9..85d7eaa 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -71,6 +71,10 @@ tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input [% INCLUDE 'RelativeLink/start-tor-browser' -%] RBM_TB_EOF chmod +x ${TB_STAGE_DIR}/Browser/start-tor-browser + # Make sure we get the desired scrollbar behavior with Gtk3, see bug 27546. + GTK_SETTINGS_DIR=${TB_STAGE_DIR}/Browser/.config/gtk-3.0 + mkdir -p $GTK_SETTINGS_DIR + cp $rootdir/gtk3-settings.ini $GTK_SETTINGS_DIR/settings.ini [% END %] tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/tor-browser.tar.gz diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 7d1720b..85754ae 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -74,6 +74,8 @@ input_files: enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' enable: '[% c("var/linux") %]' + - filename: 'gtk3-settings.ini' + enable: '[% c("var/linux") %]' - project: libdmg-hfsplus name: libdmg enable: '[% c("var/osx") %]' diff --git a/projects/tor-browser/gtk3-settings.ini b/projects/tor-browser/gtk3-settings.ini new file mode 100644 index 0000000..55c8e89 --- /dev/null +++ b/projects/tor-browser/gtk3-settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-primary-button-warps-slider = false

1 0

[tor-browser-build/master] Bug 27552: Use bundled dir on CentOS/RHEL 6
by gk＠torproject.org 18 Sep '18

18 Sep '18

commit a0420227e3f10f159a40b08a70cbb8c66f64c342 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Sep 17 12:37:17 2018 +0200 Bug 27552: Use bundled dir on CentOS/RHEL 6 On CentOS/RHEL 6, add the bundled directory from the firefox package to the LD_LIBRARY_PATH. In addition, we don't reset anymore the previous LD_LIBRARY_PATH value, but only add new directories to it. This allows users to set LD_LIBRARY_PATH before starting the browser if additional libraries are needed. --- projects/firefox/start-firefox | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/projects/firefox/start-firefox b/projects/firefox/start-firefox index dc30574..7e7685c 100644 --- a/projects/firefox/start-firefox +++ b/projects/firefox/start-firefox @@ -2,13 +2,46 @@ basedir=$(dirname "$0") -LD_LIBRARY_PATH="$basedir/TorBrowser/Tor/" +add_LD_LIBRARY_PATH() { + if test -z "$LD_LIBRARY_PATH" + then + LD_LIBRARY_PATH="$1" + else + LD_LIBRARY_PATH="$1:$LD_LIBRARY_PATH" + fi +} + +# Bug 27552: On CentOS/RHEL 6, we need to add the firefox bundled dir +# to LD_LIBRARY_PATH +if test -f /etc/system-release-cpe +then + if test "$(cut -d : -f 3 /etc/system-release-cpe)" = centos || \ + test "$(cut -d : -f 3 /etc/system-release-cpe)" = "enterprise_linux" + then + if test "$(cut -d : -f 5 /etc/system-release-cpe)" = "6" + then + if test -d /usr/lib64/firefox/bundled/lib64 + then + add_LD_LIBRARY_PATH /usr/lib64/firefox/bundled/lib64 + elif test -d /usr/lib/firefox/bundled/lib + then + add_LD_LIBRARY_PATH /usr/lib/firefox/bundled/lib + else + echo "Error: the firefox package (version 60 or more) is not installed." >&2 + echo "On CentOS/RHEL 6, Tor Browser requires the firefox package to be installed." >&2 + exit 1 + fi + fi + fi +fi + # Check if the system has a more recent version of libstdc++.so.6; if yes, use # that instead of the bundled version. "$basedir/abicheck" >/dev/null 2>&1 if [ $? -ne 0 ]; then - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$basedir/TorBrowser/Tor/libstdc++/" + add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/libstdc++/" fi +add_LD_LIBRARY_PATH "$basedir/TorBrowser/Tor/" export LD_LIBRARY_PATH exec "$basedir/firefox.real" "$@"

1 0