- tbb-commits - lists.torproject.org

[torbutton/master] Merge remote-tracking branch 'gitlab/merge-requests/6' into master
by gk＠torproject.org 16 Aug '20

16 Aug '20

commit 3dc1c58d6c494eeb5514ad84831b76661667ba2c Merge: 6c2cf4bc b27d4fd8 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Aug 16 19:03:20 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/6' into master modules/noscript-control.js | 82 ++++++++++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 23 deletions(-)

1 0

[torbutton/master] Bug 40004: Fix noscript message passing
by gk＠torproject.org 16 Aug '20

16 Aug '20

commit b27d4fd860e5ddd18e44ec0b8041de42dc7b7b7e Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Jul 30 22:45:53 2020 +0200 Bug 40004: Fix noscript message passing --- modules/noscript-control.js | 82 ++++++++++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 23 deletions(-) diff --git a/modules/noscript-control.js b/modules/noscript-control.js index 02d5abea..3cd5f602 100644 --- a/modules/noscript-control.js +++ b/modules/noscript-control.js @@ -9,6 +9,58 @@ const { bindPref } = const { ExtensionUtils } = ChromeUtils.import("resource://gre/modules/ExtensionUtils.jsm"); const { MessageChannel } = ChromeUtils.import("resource://gre/modules/MessageChannel.jsm"); +const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); + +XPCOMUtils.defineLazyModuleGetters(this, { + ExtensionParent: "resource://gre/modules/ExtensionParent.jsm", +}); + +async function waitForExtensionMessage(extensionId, checker = () => {}) { + const { torWaitForExtensionMessage } = ExtensionParent; + if (torWaitForExtensionMessage) { + return torWaitForExtensionMessage(extensionId, checker); + } + + // Old messaging <= 78 + return new Promise(resolve => { + const listener = ({ data }) => { + for (const msg of data) { + if (msg.recipient.extensionId === extensionId) { + const deserialized = msg.data.deserialize({}); + if (checker(deserialized)) { + Services.mm.removeMessageListener( + "MessageChannel:Messages", + listener + ); + resolve(deserialized); + } + } + } + }; + Services.mm.addMessageListener("MessageChannel:Messages", listener); + }); +} + +async function sendExtensionMessage(extensionId, message) { + const { torSendExtensionMessage } = ExtensionParent; + if (torSendExtensionMessage) { + return torSendExtensionMessage(extensionId, message); + } + + // Old messaging <= 78 + Services.cpmm.sendAsyncMessage("MessageChannel:Messages", [ + { + messageName: "Extension:Message", + sender: { id: extensionId, extensionId }, + recipient: { extensionId }, + data: new StructuredCloneHolder(message), + channelId: ExtensionUtils.getUniqueId(), + responseType: MessageChannel.RESPONSE_NONE, + }, + ]); + return undefined; +} + let logger = Cc["@torproject.org/torbutton-logger;1"] .getService(Ci.nsISupports).wrappedJSObject; let log = (level, msg) => logger.log(level, msg); @@ -113,20 +165,13 @@ var initialize = () => { // TODO: Is there a better way? let sendNoScriptSettings = settings => - Services.cpmm.sendAsyncMessage("MessageChannel:Messages", [{ - messageName: "Extension:Message", - sender: { id: noscriptID, extensionId: noscriptID }, - recipient: { extensionId: noscriptID }, - data: new StructuredCloneHolder(settings), - channelId: ExtensionUtils.getUniqueId(), - responseType: MessageChannel.RESPONSE_NONE, - }]); + sendExtensionMessage(noscriptID, settings); // __setNoScriptSafetyLevel(safetyLevel)__. // Set NoScript settings according to a particular safety level // (security slider level): 0 = Standard, 1 = Safer, 2 = Safest let setNoScriptSafetyLevel = safetyLevel => - sendNoScriptSettings(noscriptSettings(safetyLevel)); + sendNoScriptSettings(noscriptSettings(safetyLevel)); // __securitySliderToSafetyLevel(sliderState)__. // Converts the "extensions.torbutton.security_slider" pref value @@ -136,20 +181,9 @@ var initialize = () => { // Wait for the first message from NoScript to arrive, and then // bind the security_slider pref to the NoScript settings. - const listener = ({ data }) => { - for (const msg of data) { - if (msg.recipient.extensionId === noscriptID) { - messageListener(msg.data.deserialize({}), msg.sender); - } - } - }; - let messageListener = (a, b, c) => { + let messageListener = a => { try { - log(3, `Message received from NoScript: ${JSON.stringify([a, b, c])}`); - if (a.__meta.name !== "started") { - return; - } - Services.mm.removeMessageListener("MessageChannel:Messages", listener); + log(3, `Message received from NoScript: ${JSON.stringify([a])}`); 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 @@ -167,7 +201,9 @@ var initialize = () => { log(5, e.message); } }; - Services.mm.addMessageListener("MessageChannel:Messages", listener); + waitForExtensionMessage(noscriptID, a => a.__meta.name === "started").then( + messageListener + ); log(3, "Listening for message from NoScript."); } catch (e) { log(5, e.message);

1 0

[tor-browser-build/master] Add missing Changelog entries
by gk＠torproject.org 14 Aug '20

14 Aug '20

commit 0bcad4cf0f66b822ce933e4b26650f1261219a8f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 14 12:44:00 2020 +0000 Add missing Changelog entries --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index da5762b..9f438ac 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -12,13 +12,17 @@ Tor Browser 10.0a5 -- August 18 2020 * Bug 34206: Tor Launcher button labels are missing (Firefox 76) * Translations update * Update NoScript to 11.0.37 + * Bug 11154: Disable TLS 1.0 (and 1.1) by default * Bug 16931: Sanitize the add-on blocklist update URL + * Bug 17374: Disable 1024-DH Encryption by default * Bug 30682: Disable Intermediate CA Preloading * Bug 30812: Exempt about: pages from Resist Fingerprinting * Bug 31918+33533+40024+40037: Rebase Tor Browser esr68 patches for ESR 78 [tor-browser] * Bug 32612: Update MAR_CHANNEL_ID for the alpha + * Bug 32886: Separate treatment of @media interaction features for desktop and android * Bug 33534: Review FF release notes from FF69 to latest (FF78) * Bug 33697: Use old search config based on list.json + * Bug 33721: PDF Viewer is not working in the safest security level * Bug 33734: Set MOZ_NORMANDY to False * Bug 33737: Fix aboutDialog.js error for Firefox nightlies * Bug 33848: Disable Enhanced Tracking Protection @@ -50,6 +54,8 @@ Tor Browser 10.0a5 -- August 18 2020 * Windows * Bug 33855: Don't use site's icon as window icon in Windows in private mode * Bug 40061: Omit the Windows default browser agent from the build [tor-browser] + * OS X + * Bug 32252: Tor Browser does not display correctly in VMWare Fusion on macOS (mojave) * Build System * All Platforms * Bug 31845: Bump GCC version for Linux to 9.3.0

1 0

[tor-browser-build/master] Pick up changes for -build2
by gk＠torproject.org 14 Aug '20

14 Aug '20

commit c1a3bc5ad91b0e27c2268c7802ba4d122290b60a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 14 12:44:28 2020 +0000 Pick up changes for -build2 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 3681973..8f1143e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '10.0a5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 10.0a4 project_name: tor-browser

1 0

[tor-browser-build/master] We only have desktop alphas based on > 68 ESR for now
by gk＠torproject.org 14 Aug '20

14 Aug '20

commit a53e12f394f73bcff5ca325f0d9298b87422906f Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 14 12:19:45 2020 +0000 We only have desktop alphas based on > 68 ESR for now --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4947441..3cc297a 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ release-src: submodule-update $(rbm) build release --target release --target torbrowser-src alpha: submodule-update - $(rbm) build release --target alpha --target torbrowser-all + $(rbm) build release --target alpha --target torbrowser-all-desktop alpha-android: submodule-update $(rbm) build release --target alpha --target torbrowser-all-android

1 0

[tor-browser-build/master] Release preparations for 10.0a5
by gk＠torproject.org 14 Aug '20

14 Aug '20

commit 4d229251893ce277bfe0ccb55ac3b4f5d3b20ea9 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 14 12:20:29 2020 +0000 Release preparations for 10.0a5 Versions bump and Changelog update --- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 80 ++++++++++++++++++++++ projects/tor-browser/config | 4 +- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 4 +- 5 files changed, 86 insertions(+), 6 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 663108d..da5762b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,83 @@ +Tor Browser 10.0a5 -- August 18 2020 + * Windows + OS X + Linux + * Update Firefox to 78.1.0esr + * Update Tor to 0.4.4.4-rc + * Update Tor Launcher to 0.2.22 + * Bug 32174: Replace XUL <textbox> with <html:input> + * Bug 33890: Rename XUL files to XHTML + * Bug 33862: Fix usages of createTransport API + * Bug 33906: Fix Tor-Launcher issues for Firefox 75 + * Bug 33998: Use CSS grid instead of XUL grid + * Bug 34164: Tor Launcher deadlocks during startup (Firefox 77) + * Bug 34206: Tor Launcher button labels are missing (Firefox 76) + * Translations update + * Update NoScript to 11.0.37 + * Bug 16931: Sanitize the add-on blocklist update URL + * Bug 30682: Disable Intermediate CA Preloading + * Bug 30812: Exempt about: pages from Resist Fingerprinting + * Bug 31918+33533+40024+40037: Rebase Tor Browser esr68 patches for ESR 78 [tor-browser] + * Bug 32612: Update MAR_CHANNEL_ID for the alpha + * Bug 33534: Review FF release notes from FF69 to latest (FF78) + * Bug 33697: Use old search config based on list.json + * Bug 33734: Set MOZ_NORMANDY to False + * Bug 33737: Fix aboutDialog.js error for Firefox nightlies + * Bug 33848: Disable Enhanced Tracking Protection + * Bug 33851: Patch out Parental Controls detection and logging + * Bug 33852: Clean up about:logins to not mention Sync + * Bug 33856: Set browser.privatebrowsing.forceMediaMemoryCache to True + * Bug 33862: Fix usages of createTransport API + * Bug 33867: Disable password manager and password generation + * Bug 33890: Rename XUL files to XHTML + * Bug 33892: Add brandProductName to brand.dtd and brand.properties + * Bug 33962: Uplift patch for bug 5741 (dns leak protection) + * Bug 34125: API change in protocolProxyService.registerChannelFilter + * Bug 40001: Generate tor-browser-brand.ftl when importing translations [torbutton] + * Bug 40002: Fix generateNSGetFactory being moved to ComponentUtils [torbutton] + * Bug 40003: Adapt code for L10nRegistry API changes [torbutton] + * Bug 40005: Initialize the identity UI before setting up the circuit display [torbutton] + * Bug 40016: Update Snowflake to discover NAT type [tor-browser-build] + * Bug 40017: Audit Firefox 68-78 diff for proxy issues [tor-browser] + * Bug 40022: Update new icons in Tor Browser branding [tor-browser] + * Bug 40025: Revert add-on permissions due to Mozilla's 1560059 [tor-browser] + * Bug 40036: Remove product version/updatce channel from #13379 patch [tor-browser] + * Bug 40038: Review RemoteSettings for ESR 78 [tor-browser] + * Bug 40048: Disable various ESR78 features via prefs [tor-browser] + * Bug 40059: Verify our external helper patch is sill working [tor-browser] + * Bug 40066: Update existing prefs for ESR 78 [tor-browser] + * Bug 40073: Disable remote Public Suffic List fetching [tor-browser] + * Bug 40078: Backport patches for bug 1651680 for now [tor-browser] + * Translations update + * Windows + * Bug 33855: Don't use site's icon as window icon in Windows in private mode + * Bug 40061: Omit the Windows default browser agent from the build [tor-browser] + * Build System + * All Platforms + * Bug 31845: Bump GCC version for Linux to 9.3.0 + * Bug 34011: Bump clang to 9.0.1 + * Bug 34014: Enable sqlite3 support in Python + * Bug 34390: Don't copy DBM libraries anymore + * Bug 34391: Remove unused --enable-signmar option + * Bug 40004: Adapt Rust project for Firefox 78 ESR [tor-browser-build] + * Bug 40005: Adapt Node project for Firefox 78 ESR [tor-browser-build] + * Bug 40006: Adapt cbindgen for Firefox 78 ESR [tor-browser-build] + * Bug 40037: Move projects over to clang-source [tor-browser-build] + * Bug 40026: Fix full .mar creation for esr78 [tor-browser-build] + * Bug 40027: Fix incremental .mar creation for esr78 [tor-browser-build] + * Bug 40028: Do not reference unset env variables [tor-browser-build] + * Windows + * Bug 34230: Update Windows toolchain for Firefox 78 ESR + * Bug 40015: Use only 64bit fxc2 [tor-browser-build] + * Bug 40017: Enable stripping again on Windows [tor-browser-build] + * Bug 40061: Omit the Windows default browser agent from the build [tor-browser-build] + * OS X + * Bug 34229: Update macOS toolchain for Firefox 78 ESR + * Bug 40003: Update cctools version for Firefox 78 ESR [tor-browser-build] + * Bug 40018: Add libtapi project for cctools [tor-browser-build] + * Bug 40019: Ship our own runtime library for macOS [tor-browser-build] + * Linux + * Bug 34359: Adapt abicheck.cc to deal with newer GCC version + * Bug 34386: Fix up clang compilation on Linux + Tor Browser 10.0a4 -- July 28 2020 * All Platforms * Update Firefox to 68.11.0esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index da6e40b..251b1ca 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -73,9 +73,9 @@ input_files: enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - 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: 088c0b0f08529d88aacee3b1c09cfafe304b98cb2847c3fc255e05d1bf10bd6d + sha256sum: fed4b7554da3e334c32f27d155967fd1bc40e7b80941290bb9a57bb3f40e7480 - 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 9aaca27..ba799c5 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.21.8 +version: 0.2.22 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 8fec5b2..abb9067 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.4.4.1-alpha +version: 0.4.4.4-rc git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index e2323db..3681973 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.0a3' + torbrowser_version: '10.0a5' torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.0a1 + - 10.0a4 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 14 Aug '20

14 Aug '20

commit e62ab89b8ec35fd172f5f8581c0d0ee985a8ff0c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 14 10:28:58 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index f55f5953c6ad..6c2cf4bce30c 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit f55f5953c6adb6d75cad74fbb6c3b8fa2d617004 +Subproject commit 6c2cf4bce30cf21bb3cb121e940248cd3b8a164a

1 0

[tor-browser-build/master] Include missing Changelog entries
by gk＠torproject.org 14 Aug '20

14 Aug '20

commit e52e2c6fe001f541b36c841fcafee3158819c8fa Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 14 08:00:45 2020 +0000 Include missing Changelog entries --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 45ecdf8..663108d 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1904,6 +1904,7 @@ Tor Browser 8.0 -- September 5 2018 * Bug 21607: Disable WebVR for now until it is properly audited * Bug 21549: Disable wasm for now until it is properly audited * Bug 26614: Disable Web Authentication API until it is properly audited + * Bug 18598: Disable WebSpeech API * Bug 27281: Enable Reader View mode again * Bug 26114: Don't expose navigator.mozAddonManager to websites * Bug 21850: Update about:tbupdate handling for e10s @@ -1917,6 +1918,7 @@ Tor Browser 8.0 -- September 5 2018 * Bug 25215: Revert bug 18619 (we are not disabling IndexedDB any longer) * Bug 19910: Rip out optimistic data socks handshake variant (#3875) * Bug 22564: Hide Firefox Sync + * Bug 21484: Hide "What's New" link from About dialog * Bug 25090: Disable updater telemetry * Bug 26127: Make sure Torbutton and Tor Launcher are not treated as legacy extensions * Bug 13575: Disable randomised Firefox HTTP cache decay user tests @@ -2103,7 +2105,9 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 22756: Show Canvas prompt only after user interaction * Bug 26045: Add new MAR signing keys * Bug 22564: Hide Firefox Sync + * Bug 21484: Hide "What's New" link from About dialog * Bug 25090: Disable updater telemetry + * Bug 18598: Disable WebSpeech API * Bug 26127: Make sure Torbutton and Tor Launcher are not treated as legacy extensions * Bug 26073: Migrate general.useragent.locale to intl.locale.requested * Bug 20628: Make Tor Browser available in da, he, sv-SE, and zh-TW

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] squash! Bug 31740: Remove some unnecessary RemoteSettings instances
by gk＠torproject.org 14 Aug '20

14 Aug '20

commit 8124060e2f334107fbb31a1e7fb89f876c2d19ec Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Aug 5 22:53:46 2020 +0200 squash! Bug 31740: Remove some unnecessary RemoteSettings instances Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. --- security/manager/ssl/RemoteSecuritySettings.jsm | 22 ++++++++++++++++++++++ services/settings/IDBHelpers.jsm | 4 ++++ services/settings/dumps/blocklists/moz.build | 8 +------- services/settings/dumps/main/moz.build | 5 ----- services/settings/dumps/security-state/moz.build | 1 - .../components/antitracking/antitracking.manifest | 2 +- toolkit/components/antitracking/components.conf | 7 ------- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/security/manager/ssl/RemoteSecuritySettings.jsm b/security/manager/ssl/RemoteSecuritySettings.jsm index 199eeb5b58e1..96d6a7a2de48 100644 --- a/security/manager/ssl/RemoteSecuritySettings.jsm +++ b/security/manager/ssl/RemoteSecuritySettings.jsm @@ -350,6 +350,16 @@ var RemoteSecuritySettings = { class IntermediatePreloads { constructor() { + this.maybeInit(); + } + + maybeInit() { + if ( + this.client || + !Services.prefs.getBoolPref(INTERMEDIATES_ENABLED_PREF, true) + ) { + return; + } this.client = RemoteSettings( Services.prefs.getCharPref(INTERMEDIATES_COLLECTION_PREF), { @@ -379,6 +389,7 @@ class IntermediatePreloads { ); return; } + this.maybeInit(); // Download attachments that are awaiting download, up to a max. const maxDownloadsPerRun = Services.prefs.getIntPref( @@ -704,6 +715,16 @@ function compareFilters(filterA, filterB) { class CRLiteFilters { constructor() { + this.maybeInit(); + } + + maybeInit() { + if ( + this.client || + !Services.prefs.getBoolPref(CRLITE_FILTERS_ENABLED_PREF, true) + ) { + return; + } this.client = RemoteSettings( Services.prefs.getCharPref(CRLITE_FILTERS_COLLECTION_PREF), { @@ -729,6 +750,7 @@ class CRLiteFilters { ); return; } + this.maybeInit(); let current = await this.client.db.list(); let fullFilters = current.filter(filter => !filter.incremental); if (fullFilters.length < 1) { diff --git a/services/settings/IDBHelpers.jsm b/services/settings/IDBHelpers.jsm index 5dc59c3687ef..010a5ea82987 100644 --- a/services/settings/IDBHelpers.jsm +++ b/services/settings/IDBHelpers.jsm @@ -188,6 +188,10 @@ async function openIDB(allowUpgrades = true) { }); } if (event.oldVersion < 3) { + // Clear existing stores for a fresh start + transaction.objectStore("records").clear(); + transaction.objectStore("timestamps").clear(); + transaction.objectStore("collections").clear(); // Attachment store db.createObjectStore("attachments", { keyPath: ["cid", "attachmentId"], diff --git a/services/settings/dumps/blocklists/moz.build b/services/settings/dumps/blocklists/moz.build index 1683ab6aafa4..3ba9ba4980a8 100644 --- a/services/settings/dumps/blocklists/moz.build +++ b/services/settings/dumps/blocklists/moz.build @@ -8,15 +8,9 @@ with Files('**'): BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation') # The addons blocklist is also in mobile/android/installer/package-manifest.in -FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons-bloomfilters.json', - 'addons.json', +FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons.json', 'gfx.json', 'plugins.json'] -FINAL_TARGET_FILES.defaults.settings.blocklists['addons-bloomfilters'] += [ - 'addons-bloomfilters/addons-mlbf.bin', - 'addons-bloomfilters/addons-mlbf.bin.meta.json' -] - if CONFIG['MOZ_BUILD_APP'] == 'browser': DIST_SUBDIR = 'browser' diff --git a/services/settings/dumps/main/moz.build b/services/settings/dumps/main/moz.build index 3628fa00b5e6..e25fc4214042 100644 --- a/services/settings/dumps/main/moz.build +++ b/services/settings/dumps/main/moz.build @@ -3,15 +3,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. FINAL_TARGET_FILES.defaults.settings.main += [ - 'anti-tracking-url-decoration.json', 'example.json', 'hijack-blocklists.json', 'language-dictionaries.json', - 'onboarding.json', - 'search-config.json', 'search-default-override-allowlist.json', - 'sites-classification.json', - 'url-classifier-skip-urls.json', ] if CONFIG['MOZ_BUILD_APP'] == 'browser': diff --git a/services/settings/dumps/security-state/moz.build b/services/settings/dumps/security-state/moz.build index d8f8227a0278..37410d0fb054 100644 --- a/services/settings/dumps/security-state/moz.build +++ b/services/settings/dumps/security-state/moz.build @@ -3,7 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. FINAL_TARGET_FILES.defaults.settings['security-state'] += [ - 'intermediates.json', 'onecrl.json', ] diff --git a/toolkit/components/antitracking/antitracking.manifest b/toolkit/components/antitracking/antitracking.manifest index 5eb37f9a3f99..872e6af07575 100644 --- a/toolkit/components/antitracking/antitracking.manifest +++ b/toolkit/components/antitracking/antitracking.manifest @@ -1 +1 @@ -category profile-after-change URLDecorationAnnotationsService @mozilla.org/tracking-url-decoration-service;1 process=main +# category profile-after-change URLDecorationAnnotationsService @mozilla.org/tracking-url-decoration-service;1 process=main diff --git a/toolkit/components/antitracking/components.conf b/toolkit/components/antitracking/components.conf index ddd824522c16..cd46ed1046d5 100644 --- a/toolkit/components/antitracking/components.conf +++ b/toolkit/components/antitracking/components.conf @@ -11,13 +11,6 @@ Classes = [ 'jsm': 'resource://gre/modules/TrackingDBService.jsm', 'constructor': 'TrackingDBService', }, - { - 'cid': '{5874af6d-5719-4e1b-b155-ef4eae7fcb32}', - 'contract_ids': ['@mozilla.org/tracking-url-decoration-service;1'], - 'jsm': 'resource://gre/modules/URLDecorationAnnotationsService.jsm', - 'constructor': 'URLDecorationAnnotationsService', - 'processes': ProcessSelector.MAIN_PROCESS_ONLY, - }, { 'cid': '{90d1fd17-2018-4e16-b73c-a04a26fa6dd4}', 'contract_ids': ['@mozilla.org/purge-tracker-service;1'],

1 0

[tor-browser/tor-browser-78.1.0esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/33' into tor-browser-78.1.0esr-10.0-1
by gk＠torproject.org 14 Aug '20

14 Aug '20

commit 2ee24e9976652eef800b6d00b57ba322213a1f12 Merge: d2c3d8f23856 8124060e2f33 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 14 09:54:56 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/33' into tor-browser-78.1.0esr-10.0-1 security/manager/ssl/RemoteSecuritySettings.jsm | 22 ++++++++++++++++++++++ services/settings/IDBHelpers.jsm | 4 ++++ services/settings/dumps/blocklists/moz.build | 8 +------- services/settings/dumps/main/moz.build | 5 ----- services/settings/dumps/security-state/moz.build | 1 - .../components/antitracking/antitracking.manifest | 2 +- toolkit/components/antitracking/components.conf | 7 ------- 7 files changed, 28 insertions(+), 21 deletions(-)

1 0