- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-91.0b5-11.0-1] Bug 16940: After update, load local change notes.
by sysrqb＠torproject.org 22 Jul '21

22 Jul '21

commit 6e3cd918896110e6dac7608f895ad9c181bee5de Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Nov 25 11:36:20 2015 -0500 Bug 16940: After update, load local change notes. Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and includes a link to the remote post-update page (typically our blog entry for the release). Always load about:tbupdate in a content process, but implement the code that reads the file system (changelog) in the chrome process for compatibility with future sandboxing efforts. Also fix bug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor. --- browser/actors/AboutTBUpdateChild.jsm | 12 +++ browser/actors/AboutTBUpdateParent.jsm | 120 +++++++++++++++++++++ browser/actors/moz.build | 6 ++ .../base/content/abouttbupdate/aboutTBUpdate.css | 74 +++++++++++++ .../base/content/abouttbupdate/aboutTBUpdate.js | 27 +++++ .../base/content/abouttbupdate/aboutTBUpdate.xhtml | 39 +++++++ browser/base/content/browser-siteIdentity.js | 2 +- browser/base/content/browser.js | 4 + browser/base/jar.mn | 5 + browser/components/BrowserContentHandler.jsm | 55 +++++++--- browser/components/BrowserGlue.jsm | 15 +++ browser/components/about/AboutRedirector.cpp | 6 ++ browser/components/about/components.conf | 3 + browser/components/moz.build | 5 +- .../locales/en-US/chrome/browser/aboutTBUpdate.dtd | 8 ++ browser/locales/jar.mn | 3 + toolkit/modules/RemotePageAccessManager.jsm | 5 + 17 files changed, 373 insertions(+), 16 deletions(-) diff --git a/browser/actors/AboutTBUpdateChild.jsm b/browser/actors/AboutTBUpdateChild.jsm new file mode 100644 index 000000000000..4670da19b3db --- /dev/null +++ b/browser/actors/AboutTBUpdateChild.jsm @@ -0,0 +1,12 @@ +// Copyright (c) 2020, The Tor Project, Inc. +// See LICENSE for licensing information. +// +// vim: set sw=2 sts=2 ts=8 et syntax=javascript: + +var EXPORTED_SYMBOLS = ["AboutTBUpdateChild"]; + +const { RemotePageChild } = ChromeUtils.import( + "resource://gre/actors/RemotePageChild.jsm" +); + +class AboutTBUpdateChild extends RemotePageChild {} diff --git a/browser/actors/AboutTBUpdateParent.jsm b/browser/actors/AboutTBUpdateParent.jsm new file mode 100644 index 000000000000..56a10394565a --- /dev/null +++ b/browser/actors/AboutTBUpdateParent.jsm @@ -0,0 +1,120 @@ +// Copyright (c) 2020, The Tor Project, Inc. +// See LICENSE for licensing information. +// +// vim: set sw=2 sts=2 ts=8 et syntax=javascript: + +"use strict"; + +this.EXPORTED_SYMBOLS = ["AboutTBUpdateParent"]; + +const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm"); +const { AppConstants } = ChromeUtils.import( + "resource://gre/modules/AppConstants.jsm" +); + +const kRequestUpdateMessageName = "FetchUpdateData"; + +/** + * This code provides services to the about:tbupdate page. Whenever + * about:tbupdate needs to do something chrome-privileged, it sends a + * message that's handled here. It is modeled after Mozilla's about:home + * implementation. + */ +class AboutTBUpdateParent extends JSWindowActorParent { + receiveMessage(aMessage) { + if (aMessage.name == kRequestUpdateMessageName) { + return this.releaseNoteInfo; + } + return undefined; + } + + get moreInfoURL() { + try { + return Services.prefs.getCharPref("torbrowser.post_update.url"); + } catch (e) {} + + // Use the default URL as a fallback. + return Services.urlFormatter.formatURLPref("startup.homepage_override_url"); + } + + // Read the text from the beginning of the changelog file that is located + // at TorBrowser/Docs/ChangeLog.txt and return an object that contains + // the following properties: + // version e.g., Tor Browser 8.5 + // releaseDate e.g., March 31 2019 + // releaseNotes details of changes (lines 2 - end of ChangeLog.txt) + // We attempt to parse the first line of ChangeLog.txt to extract the + // version and releaseDate. If parsing fails, we return the entire first + // line in version and omit releaseDate. + // + // On Mac OS, when building with --enable-tor-browser-data-outside-app-dir + // to support Gatekeeper signing, the ChangeLog.txt file is located in + // TorBrowser.app/Contents/Resources/TorBrowser/Docs/. + get releaseNoteInfo() { + let info = { moreInfoURL: this.moreInfoURL }; + + try { + let f; + if (AppConstants.TOR_BROWSER_DATA_OUTSIDE_APP_DIR) { + // "XREExeF".parent is the directory that contains firefox, i.e., + // Browser/ or, on Mac OS, TorBrowser.app/Contents/MacOS/. + f = Services.dirsvc.get("XREExeF", Ci.nsIFile).parent; + if (AppConstants.platform === "macosx") { + f = f.parent; + f.append("Resources"); + } + f.append("TorBrowser"); + } else { + // "DefProfRt" is .../TorBrowser/Data/Browser + f = Services.dirsvc.get("DefProfRt", Ci.nsIFile); + f = f.parent.parent; // Remove "Data/Browser" + } + + f.append("Docs"); + f.append("ChangeLog.txt"); + + let fs = Cc["@mozilla.org/network/file-input-stream;1"].createInstance( + Ci.nsIFileInputStream + ); + fs.init(f, -1, 0, 0); + let s = NetUtil.readInputStreamToString(fs, fs.available()); + fs.close(); + + // Truncate at the first empty line. + s = s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); + + // Split into first line (version plus releaseDate) and + // remainder (releaseNotes). + // This first match() uses multiline mode with two capture groups: + // first line: (.*$) + // remaining lines: ([\s\S]+) + // [\s\S] matches all characters including end of line. This trick + // is needed because when using JavaScript regex in multiline mode, + // . does not match an end of line character. + let matchArray = s.match(/(.*$)\s*([\s\S]+)/m); + if (matchArray && matchArray.length == 3) { + info.releaseNotes = matchArray[2]; + let line1 = matchArray[1]; + // Extract the version and releaseDate. The first line looks like: + // Tor Browser 8.5 -- May 1 2019 + // The regex uses two capture groups: + // text that does not include a hyphen: (^[^-]*) + // remaining text: (.*$) + // In between we match optional whitespace, one or more hyphens, and + // optional whitespace by using: \s*-+\s* + matchArray = line1.match(/(^[^-]*)\s*-+\s*(.*$)/); + if (matchArray && matchArray.length == 3) { + info.version = matchArray[1]; + info.releaseDate = matchArray[2]; + } else { + info.version = line1; // Match failed: return entire line in version. + } + } else { + info.releaseNotes = s; // Only one line: use as releaseNotes. + } + } catch (e) {} + + return info; + } +} diff --git a/browser/actors/moz.build b/browser/actors/moz.build index 28c981625a7f..3eac455c5356 100644 --- a/browser/actors/moz.build +++ b/browser/actors/moz.build @@ -87,3 +87,9 @@ FINAL_TARGET_FILES.actors += [ "WebRTCChild.jsm", "WebRTCParent.jsm", ] + +if CONFIG["TOR_BROWSER_UPDATE"]: + FINAL_TARGET_FILES.actors += [ + "AboutTBUpdateChild.jsm", + "AboutTBUpdateParent.jsm", + ] diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.css b/browser/base/content/abouttbupdate/aboutTBUpdate.css new file mode 100644 index 000000000000..7c1a34b77f17 --- /dev/null +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.css @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2019, The Tor Project, Inc. + * See LICENSE for licensing information. + * + * vim: set sw=2 sts=2 ts=8 et syntax=css: + */ + +:root { + --abouttor-text-color: white; + --abouttor-bg-toron-color: #420C5D; +} + +body { + font-family: Helvetica, Arial, sans-serif; + color: var(--abouttor-text-color); + background-color: var(--abouttor-bg-toron-color); + background-attachment: fixed; + background-size: 100% 100%; +} + +a { + color: var(--abouttor-text-color); +} + +.two-column-grid { + display: inline-grid; + grid-template-columns: auto auto; + grid-column-gap: 50px; + margin: 10px 0px 0px 50px; +} + +.two-column-grid div { + margin-top: 40px; + align-self: baseline; /* Align baseline of text across the row. */ +} + +.label-column { + font-size: 14px; + font-weight: 400; +} + +/* + * Use a reduced top margin to bring the row that contains the + * "visit our website" link closer to the row that precedes it. This + * looks better because the "visit our website" row does not have a + * label in the left column. + */ +div.more-info-row { + margin-top: 5px; + font-size: 14px; +} + +#version-content { + font-size: 50px; + font-weight: 300; +} + +body:not([havereleasedate]) .release-date-cell { + display: none; +} + +#releasedate-content { + font-size: 17px; +} + +#releasenotes-label { + align-self: start; /* Anchor "Release Notes" label at the top. */ +} + +#releasenotes-content { + font-family: monospace; + font-size: 15px; + white-space: pre; +} diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.js b/browser/base/content/abouttbupdate/aboutTBUpdate.js new file mode 100644 index 000000000000..ec070e2cb131 --- /dev/null +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.js @@ -0,0 +1,27 @@ +// Copyright (c) 2020, The Tor Project, Inc. +// See LICENSE for licensing information. +// +// vim: set sw=2 sts=2 ts=8 et syntax=javascript: + +/* eslint-env mozilla/frame-script */ + +// aData may contain the following string properties: +// version +// releaseDate +// moreInfoURL +// releaseNotes +function onUpdate(aData) { + document.getElementById("version-content").textContent = aData.version; + if (aData.releaseDate) { + document.body.setAttribute("havereleasedate", "true"); + document.getElementById("releasedate-content").textContent = + aData.releaseDate; + } + if (aData.moreInfoURL) { + document.getElementById("infolink").setAttribute("href", aData.moreInfoURL); + } + document.getElementById("releasenotes-content").textContent = + aData.releaseNotes; +} + +RPMSendQuery("FetchUpdateData").then(onUpdate); diff --git a/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml new file mode 100644 index 000000000000..8489cfef5083 --- /dev/null +++ b/browser/base/content/abouttbupdate/aboutTBUpdate.xhtml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE html [ + <!ENTITY % htmlDTD + PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "DTD/xhtml1-strict.dtd"> + %htmlDTD; + <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> + %globalDTD; + <!ENTITY % tbUpdateDTD SYSTEM "chrome://browser/locale/aboutTBUpdate.dtd"> + %tbUpdateDTD; +]> + +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> + <title>&aboutTBUpdate.changelogTitle;</title> + <link rel="stylesheet" type="text/css" + href="chrome://browser/content/abouttbupdate/aboutTBUpdate.css"/> + <script src="chrome://browser/content/abouttbupdate/aboutTBUpdate.js" + type="text/javascript"/> +</head> +<body dir="&locale.dir;"> +<div class="two-column-grid"> + <div class="label-column">&aboutTBUpdate.version;</div> + <div id="version-content"/> + + <div class="label-column release-date-cell">&aboutTBUpdate.releaseDate;</div> + <div id="releasedate-content" class="release-date-cell"/> + + <div class="more-info-row"/> + <div class="more-info-row">&aboutTBUpdate.linkPrefix;<a id="infolink">&aboutTBUpdate.linkLabel;</a>&aboutTBUpdate.linkSuffix;</div> + + <div id="releasenotes-label" + class="label-column">&aboutTBUpdate.releaseNotes;</div> + <div id="releasenotes-content"></div> +</div> +</body> +</html> diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js index 859ebf5eaa3f..91940db44ca4 100644 --- a/browser/base/content/browser-siteIdentity.js +++ b/browser/base/content/browser-siteIdentity.js @@ -57,7 +57,7 @@ var gIdentityHandler = { * RegExp used to decide if an about url should be shown as being part of * the browser UI. */ - _secureInternalPages: /^(?:accounts|addons|cache|certificate|config|crashes|downloads|license|logins|preferences|protections|rights|sessionrestore|support|welcomeback|ion)(?:[?#]|$)/i, + _secureInternalPages: (AppConstants.TOR_BROWSER_UPDATE ? /^(?:accounts|addons|cache|certificate|config|crashes|downloads|license|logins|preferences|protections|rights|sessionrestore|support|welcomeback|ion|tor|tbupdate)(?:[?#]|$)/i : /^(?:accounts|addons|cache|certificate|config|crashes|downloads|license|logins|preferences|protections|rights|sessionrestore|support|welcomeback|ion|tor)(?:[?#]|$)/i), /** * Whether the established HTTPS connection is considered "broken". diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 7f370894bf95..f82d484b753c 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -643,6 +643,10 @@ var gInitialPages = [ "about:welcome", ]; +if (AppConstants.TOR_BROWSER_UPDATE) { + gInitialPages.push("about:tbupdate"); +} + function isInitialPage(url) { if (!(url instanceof Ci.nsIURI)) { try { diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 7be13da2dd5d..6554f6a5707e 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -33,6 +33,11 @@ browser.jar: content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) +#ifdef TOR_BROWSER_UPDATE + content/browser/abouttbupdate/aboutTBUpdate.xhtml (content/abouttbupdate/aboutTBUpdate.xhtml) + content/browser/abouttbupdate/aboutTBUpdate.js (content/abouttbupdate/aboutTBUpdate.js) + content/browser/abouttbupdate/aboutTBUpdate.css (content/abouttbupdate/aboutTBUpdate.css) +#endif * content/browser/browser.css (content/browser.css) content/browser/browser.js (content/browser.js) * content/browser/browser.xhtml (content/browser.xhtml) diff --git a/browser/components/BrowserContentHandler.jsm b/browser/components/BrowserContentHandler.jsm index d8e24e641447..9f6c8a33a730 100644 --- a/browser/components/BrowserContentHandler.jsm +++ b/browser/components/BrowserContentHandler.jsm @@ -629,6 +629,23 @@ nsBrowserContentHandler.prototype = { } } + // Retrieve the home page early so we can compare it against about:tor + // to decide whether or not we need an override page (second tab) after + // an update was applied. + var startPage = ""; + try { + var choice = prefb.getIntPref("browser.startup.page"); + if (choice == 1 || choice == 3) { + startPage = HomePage.get(); + } + } catch (e) { + Cu.reportError(e); + } + + if (startPage == "about:blank") { + startPage = ""; + } + var override; var overridePage = ""; var additionalPage = ""; @@ -674,6 +691,16 @@ nsBrowserContentHandler.prototype = { // into account because that requires waiting for the session file // to be read. If a crash occurs after updating, before restarting, // we may open the startPage in addition to restoring the session. + // + // Tor Browser: Instead of opening the post-update "override page" + // directly, we ensure that about:tor will be opened in a special + // mode that notifies the user that their browser was updated. + // The about:tor page will provide a link to the override page + // where the user can learn more about the update, as well as a + // link to the Tor Browser changelog page (about:tbupdate). The + // override page URL comes from the openURL attribute within the + // updates.xml file or, if no showURL action is present, from the + // startup.homepage_override_url pref. willRestoreSession = SessionStartup.isAutomaticRestoreEnabled(); overridePage = Services.urlFormatter.formatURLPref( @@ -693,6 +720,20 @@ nsBrowserContentHandler.prototype = { overridePage = overridePage.replace("%OLD_VERSION%", old_mstone); overridePage = overridePage.replace("%OLD_TOR_BROWSER_VERSION%", old_tbversion); +#ifdef TOR_BROWSER_UPDATE + if (overridePage) + { + prefb.setCharPref("torbrowser.post_update.url", overridePage); + prefb.setBoolPref("torbrowser.post_update.shouldNotify", true); + // If the user's homepage is about:tor, we will inform them + // about the update on that page; otherwise, we arrange to + // open about:tor in a secondary tab. + if (startPage === "about:tor") + overridePage = ""; + else + overridePage = "about:tor"; + } +#endif break; case OVERRIDE_NEW_BUILD_ID: if (UpdateManager.readyUpdate) { @@ -765,20 +806,6 @@ nsBrowserContentHandler.prototype = { } } - var startPage = ""; - try { - var choice = prefb.getIntPref("browser.startup.page"); - if (choice == 1 || choice == 3) { - startPage = HomePage.get(); - } - } catch (e) { - Cu.reportError(e); - } - - if (startPage == "about:blank") { - startPage = ""; - } - let skipStartPage = override == OVERRIDE_NEW_PROFILE && prefb.getBoolPref("browser.startup.firstrunSkipsHomepage"); diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 1f293a5c57f3..3beb2da3ce52 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -749,6 +749,21 @@ let JSWINDOWACTORS = { }, }; +if (AppConstants.TOR_BROWSER_UPDATE) { + JSWINDOWACTORS["AboutTBUpdate"] = { + parent: { + moduleURI: "resource:///actors/AboutTBUpdateParent.jsm", + }, + child: { + moduleURI: "resource:///actors/AboutTBUpdateChild.jsm", + events: { + DOMWindowCreated: { capture: true }, + }, + }, + matches: ["about:tbupdate"], + }; +} + (function earlyBlankFirstPaint() { let startTime = Cu.now(); if ( diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index 5412a65c315f..956e25c818e1 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -128,6 +128,12 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS}, {"ion", "chrome://browser/content/ion.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, +#ifdef TOR_BROWSER_UPDATE + {"tbupdate", "chrome://browser/content/abouttbupdate/aboutTBUpdate.xhtml", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | + nsIAboutModule::HIDE_FROM_ABOUTABOUT}, +#endif }; static nsAutoCString GetAboutModuleName(nsIURI* aURI) { diff --git a/browser/components/about/components.conf b/browser/components/about/components.conf index 0c9597ff9fb4..a880a161a0f2 100644 --- a/browser/components/about/components.conf +++ b/browser/components/about/components.conf @@ -32,6 +32,9 @@ pages = [ 'welcomeback', ] +if defined('TOR_BROWSER_UPDATE'): + pages.append('tbupdate') + Classes = [ { 'cid': '{7e4bb6ad-2fc4-4dc6-89ef-23e8e5ccf980}', diff --git a/browser/components/moz.build b/browser/components/moz.build index 5f8780e01c65..c56811d36a14 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -86,11 +86,14 @@ EXTRA_COMPONENTS += [ ] EXTRA_JS_MODULES += [ - "BrowserContentHandler.jsm", "BrowserGlue.jsm", "distribution.js", ] +EXTRA_PP_JS_MODULES += [ + "BrowserContentHandler.jsm", +] + BROWSER_CHROME_MANIFESTS += [ "safebrowsing/content/test/browser.ini", "tests/browser/browser.ini", diff --git a/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd new file mode 100644 index 000000000000..2d1e59b40eaf --- /dev/null +++ b/browser/locales/en-US/chrome/browser/aboutTBUpdate.dtd @@ -0,0 +1,8 @@ +<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> +<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> +<!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> +<!ENTITY aboutTBUpdate.linkLabel "visit our website"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.version "Version"> +<!ENTITY aboutTBUpdate.releaseDate "Release Date"> +<!ENTITY aboutTBUpdate.releaseNotes "Release Notes"> diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index 3b7963c854e1..c6fdccea7d70 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -20,6 +20,9 @@ locale/browser/accounts.properties (%chrome/browser/accounts.properties) locale/browser/app-extension-fields.properties (%chrome/browser/app-extension-fields.properties) +#ifdef TOR_BROWSER_UPDATE + locale/browser/aboutTBUpdate.dtd (%chrome/browser/aboutTBUpdate.dtd) +#endif locale/browser/browser.dtd (%chrome/browser/browser.dtd) locale/browser/browser.properties (%chrome/browser/browser.properties) locale/browser/customizableui/customizableWidgets.properties (%chrome/browser/customizableui/customizableWidgets.properties) diff --git a/toolkit/modules/RemotePageAccessManager.jsm b/toolkit/modules/RemotePageAccessManager.jsm index 50fb4ea8d417..e5111ff83782 100644 --- a/toolkit/modules/RemotePageAccessManager.jsm +++ b/toolkit/modules/RemotePageAccessManager.jsm @@ -213,6 +213,11 @@ let RemotePageAccessManager = { RPMAddMessageListener: ["*"], RPMRemoveMessageListener: ["*"], }, + "about:tbupdate": { + RPMSendQuery: [ + "FetchUpdateData", + ], + }, }, /**

1 0

[tor-browser/tor-browser-91.0b5-11.0-1] Bug 16285: Exclude ClearKey system for now
by sysrqb＠torproject.org 22 Jul '21

22 Jul '21

commit 2d241e5239a547f0c8220ce9fe5d975ca6f7188b Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 22 12:44:40 2017 +0000 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. --- browser/installer/package-manifest.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index c1b068c29ed5..0b0b65a6f932 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -460,8 +460,8 @@ bin/libfreebl_64int_3.so #endif ; media -@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@ -@RESPATH@/gmp-clearkey/0.1/manifest.json +;@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@ +;@RESPATH@/gmp-clearkey/0.1/manifest.json #ifdef MOZ_DMD ; DMD

1 0

[Git][tpo/applications/android-components][android-components-91.0.1-11.0-1] 12 commits: Bug 40005: Modify Default toolbar menu
by Matthew Finkel (＠sysrqb) 22 Jul '21

22 Jul '21

Matthew Finkel pushed to branch android-components-91.0.1-11.0-1 at The Tor Project / Applications / android-components Commits: 9130802a by Matthew Finkel at 2021-07-14T17:39:01+02:00 Bug 40005: Modify Default toolbar menu - - - - - 448c7c3e by Alex Catarineu at 2021-07-14T17:39:03+02:00 Bug 40007: Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - 1a234718 by Alex Catarineu at 2021-07-14T17:39:05+02:00 Bug 40002: Ensure system download manager is not used - - - - - 1661b6ef by Alex Catarineu at 2021-07-14T17:39:06+02:00 Bug 40009: Change the default search engines This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. - - - - - 0b4838c1 by Alex Catarineu at 2021-07-14T17:39:08+02:00 Modify Addon support Bug 40011: Hide option for disallowing addons in private mode Bug 40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - 01a33c82 by Georg Koppen at 2021-07-14T17:39:09+02:00 Bug 40013: Add option do overwrite timestamp in extension version - - - - - 81fc3d4b by Alex Catarineu at 2021-07-14T17:39:11+02:00 Bug 40015: Port padlock states for .onion services - - - - - 096ab357 by Alex Catarineu at 2021-07-14T17:39:13+02:00 Bug 40021: Force telemetry=false in Fennec settings migration - - - - - 68c62527 by Alex Catarineu at 2021-07-14T17:39:14+02:00 Bug 40022: Migrate Tor security level from Fennec - - - - - 94924df0 by Matthew Finkel at 2021-07-14T17:39:16+02:00 Modify Tracking Protection configuration Bug 40020: Disable third-party cookies Bug 40024: Disable tracking protection by default - - - - - d25092c3 by Matthew Finkel at 2021-07-14T17:39:17+02:00 Bug 40023: Stop PrivateNotificationService - - - - - 5853be27 by Matthew Finkel at 2021-07-14T17:39:19+02:00 Add support for new GeckoView interfaces Bug 40006: Expose Security Level interface Bug 40019: Expose spoofEnglish pref Bug 34439: Isolate Icon loader on Android - - - - - 30 changed files: - build.gradle - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - + components/browser/search/src/main/assets/searchplugins/ddg-onion.xml - + components/browser/search/src/main/assets/searchplugins/startpage.xml - + components/browser/search/src/main/assets/searchplugins/yahoo.xml - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt - components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt - components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AddonCollectionProvider.kt - components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - components/feature/app-links/build.gradle - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - components/feature/downloads/build.gradle - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt - components/feature/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt - components/feature/search/src/main/assets/search/list.json - components/feature/search/src/main/assets/searchplugins/ddg.xml - components/feature/toolbar/src/main/java/mozilla/components/feature/toolbar/ToolbarPresenter.kt - components/support/ktx/src/main/java/mozilla/components/support/ktx/android/content/Context.kt The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/compare… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-launcher/master] Merge remote-tracking branch 'richardgl/40547'
by sysrqb＠torproject.org 22 Jul '21

22 Jul '21

commit 474998734f19c7cef3b10abf874d523cd7940260 Merge: ed8c1e7 9bc9139 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jul 22 18:50:20 2021 +0000 Merge remote-tracking branch 'richardgl/40547' src/chrome/locale/en-US/network-settings.dtd | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-launcher/master] tor-browser#40547 - added 'Tor Not Connected' string for urlbar TorConnect box
by sysrqb＠torproject.org 22 Jul '21

22 Jul '21

commit 9bc9139710184fde5887e4d89b3c0f9ac360e468 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Jul 22 13:25:19 2021 +0200 tor-browser#40547 - added 'Tor Not Connected' string for urlbar TorConnect box --- src/chrome/locale/en-US/network-settings.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/locale/en-US/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd index 73d32e0..66c650e 100644 --- a/src/chrome/locale/en-US/network-settings.dtd +++ b/src/chrome/locale/en-US/network-settings.dtd @@ -92,4 +92,5 @@ <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network"> <!ENTITY torConnect.connectingConcise "Connecting…"> <!ENTITY torConnect.connectedConcise "Connected"> +<!ENTITY torConnect.notConnectedConcise "Not Connected"> <!ENTITY torConnect.copyLog "Copy Tor Logs">

1 0

[tor-browser/tor-browser-78.12.0esr-11.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 22 Jul '21

22 Jul '21

commit 73d57c01c2bfe398c02586ae76dab677d843df22 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Jul 16 17:32:01 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/actors/NetErrorParent.jsm | 6 +- browser/base/content/browser.js | 5 +- browser/components/BrowserGlue.jsm | 32 +- browser/components/torconnect/TorConnectParent.jsm | 200 +++++---- .../torconnect/content/aboutTorConnect.js | 466 +++++++++----------- .../torconnect/content/aboutTorConnect.xhtml | 9 - .../torconnect/content/torBootstrapUrlbar.js | 195 ++++----- .../components/torpreferences/content/torPane.js | 8 +- browser/components/urlbar/UrlbarInput.jsm | 6 +- browser/modules/TorConnect.jsm | 477 +++++++++++++++++++-- browser/modules/TorProtocolService.jsm | 101 +++-- .../processsingleton/MainProcessSingleton.jsm | 5 + toolkit/modules/RemotePageAccessManager.jsm | 28 +- 13 files changed, 941 insertions(+), 597 deletions(-) diff --git a/browser/actors/NetErrorParent.jsm b/browser/actors/NetErrorParent.jsm index fa3cbf23fcb7..6dce9af5aad0 100644 --- a/browser/actors/NetErrorParent.jsm +++ b/browser/actors/NetErrorParent.jsm @@ -17,8 +17,8 @@ const { SessionStore } = ChromeUtils.import( ); const { HomePage } = ChromeUtils.import("resource:///modules/HomePage.jsm"); -const { TorProtocolService } = ChromeUtils.import( - "resource:///modules/TorProtocolService.jsm" +const { TorConnect } = ChromeUtils.import( + "resource:///modules/TorConnect.jsm" ); const PREF_SSL_IMPACT_ROOTS = [ @@ -324,7 +324,7 @@ class NetErrorParent extends JSWindowActorParent { } break; case "ShouldShowTorConnect": - return TorProtocolService.shouldShowTorConnect(); + return TorConnect.shouldShowTorConnect; } return undefined; } diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 916cd69320cb..996ef6dcdd7f 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -77,7 +77,7 @@ XPCOMUtils.defineLazyModuleGetters(this, { TabModalPrompt: "chrome://global/content/tabprompts.jsm", TabCrashHandler: "resource:///modules/ContentCrashHandlers.jsm", TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm", - TorProtocolService: "resource:///modules/TorProtocolService.jsm", + TorConnect: "resource:///modules/TorConnect.jsm", Translation: "resource:///modules/translation/TranslationParent.jsm", OnionAliasStore: "resource:///modules/OnionAliasStore.jsm", UITour: "resource:///modules/UITour.jsm", @@ -2494,7 +2494,8 @@ var gBrowserInit = { let uri = window.arguments[0]; let defaultArgs = BrowserHandler.defaultArgs; - if (TorProtocolService.shouldShowTorConnect()) { + if (TorConnect.shouldShowTorConnect) { + TorConnect.setURIsToLoad(uri); return "about:torconnect"; } diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 8735783cee2b..cb77f4d82a3e 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -17,31 +17,6 @@ const { AppConstants } = ChromeUtils.import( "resource://gre/modules/AppConstants.jsm" ); -// TorProtocolService and TorConnect modules need to be lazily-loaded -// here because they will trigger generation of the random password used -// to talk to the tor daemon in tor-launcher. Generating the random -// password will initialize the cryptographic service ( nsNSSComponent ) -// -// If this service is init'd before the profile has been setup, it will -// use the fallback init path which behaves as if security.nocertdb=true -// -// We make these module getters so init happens when they are needed -// (when init'ing the OnionAliasStore). With theze getters, the password -// generation is triggered in torbutton after the 'profile-after-change' -// topic (so after the profile is initialized) - -ChromeUtils.defineModuleGetter( - this, - "TorProtocolService", - "resource:///modules/TorProtocolService.jsm" -); - -ChromeUtils.defineModuleGetter( - this, - "TorConnect", - "resource:///modules/TorConnect.jsm" -); - ChromeUtils.defineModuleGetter( this, "ActorManagerParent", @@ -2531,14 +2506,17 @@ BrowserGlue.prototype = { { task: () => { - if (TorProtocolService.isBootstrapDone() || !TorProtocolService.ownsTorDaemon) { + const { TorConnect, TorConnectTopics } = ChromeUtils.import( + "resource:///modules/TorConnect.jsm" + ); + if (!TorConnect.shouldShowTorConnect) { // we will take this path when the user is using the legacy tor launcher or // when Tor Browser didn't launch its own tor. OnionAliasStore.init(); } else { // this path is taken when using about:torconnect, we wait to init // after we are bootstrapped and connected to tor - const topic = "torconnect:bootstrap-complete"; + const topic = TorConnectTopics.BootstrapComplete; let bootstrapObserver = { observe(aSubject, aTopic, aData) { if (aTopic === topic) { diff --git a/browser/components/torconnect/TorConnectParent.jsm b/browser/components/torconnect/TorConnectParent.jsm index c34fab76ddbb..3937bf3ebcf8 100644 --- a/browser/components/torconnect/TorConnectParent.jsm +++ b/browser/components/torconnect/TorConnectParent.jsm @@ -3,123 +3,139 @@ var EXPORTED_SYMBOLS = ["TorConnectParent"]; const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { TorProtocolService } = ChromeUtils.import( - "resource:///modules/TorProtocolService.jsm" -); const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); -const { TorLauncherUtil } = ChromeUtils.import( - "resource://torlauncher/modules/tl-util.jsm" -); - -const { TorConnect } = ChromeUtils.import( +const { TorConnect, TorConnectTopics, TorConnectState } = ChromeUtils.import( "resource:///modules/TorConnect.jsm" ); -const kTorProcessReadyTopic = "TorProcessIsReady"; -const kTorProcessExitedTopic = "TorProcessExited"; -const kTorProcessDidNotStartTopic = "TorProcessDidNotStart"; -const kTorShowProgressPanelTopic = "TorShowProgressPanel"; -const kTorBootstrapStatusTopic = "TorBootstrapStatus"; -const kTorBootstrapErrorTopic = "TorBootstrapError"; -const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; - -const gActiveTopics = [ - kTorProcessReadyTopic, - kTorProcessExitedTopic, - kTorProcessDidNotStartTopic, - kTorShowProgressPanelTopic, - kTorBootstrapStatusTopic, - kTorBootstrapErrorTopic, - kTorLogHasWarnOrErrTopic, - "torconnect:bootstrap-complete", -]; - -const gTorLauncherPrefs = { +const TorLauncherPrefs = Object.freeze({ quickstart: "extensions.torlauncher.quickstart", -} +}); + +/* +This object is basically a marshalling interface between the TorConnect module +and a particular about:torconnect page +*/ class TorConnectParent extends JSWindowActorParent { constructor(...args) { super(...args); const self = this; - this.gObserver = { - observe(aSubject, aTopic, aData) { - const obj = aSubject?.wrappedJSObject; - if (obj) { - obj.handled = true; - } - self.sendAsyncMessage(aTopic, obj); - }, - }; - for (const topic of gActiveTopics) { - Services.obs.addObserver(this.gObserver, topic); - } + this.state = { + State: TorConnect.state, + ErrorMessage: TorConnect.errorMessage, + ErrorDetails: TorConnect.errorDetails, + BootstrapProgress: TorConnect.bootstrapProgress, + BootstrapStatus: TorConnect.bootstrapStatus, + ShowCopyLog: TorConnect.logHasWarningOrError, + QuickStartEnabled: Services.prefs.getBoolPref(TorLauncherPrefs.quickstart, false), + }; - this.quickstartObserver = { + // JSWindowActiveParent derived objects cannot observe directly, so create a member + // object to do our observing for us + // + // This object converts the various lifecycle events from the TorConnect module, and + // maintains a state object which we pass down to our about:torconnect page, which uses + // the state object to update its UI + this.torConnectObserver = { observe(aSubject, aTopic, aData) { - if (aTopic === "nsPref:changed" && - aData == gTorLauncherPrefs.quickstart) { - self.sendAsyncMessage("TorQuickstartPrefChanged", Services.prefs.getBoolPref(gTorLauncherPrefs.quickstart)); + let obj = aSubject?.wrappedJSObject; + + // update our state struct based on received torconnect topics and forward on + // to aboutTorConnect.js + switch(aTopic) { + case TorConnectTopics.StateChange: { + self.state.State = obj.state; + // clear any previous error information if we are bootstrapping + if (self.state.State === TorConnectState.Bootstrapping) { + self.state.ErrorMessage = null; + self.state.ErrorDetails = null; + } + break; + } + case TorConnectTopics.BootstrapProgress: { + self.state.BootstrapProgress = obj.progress; + self.state.BootstrapStatus = obj.status; + self.state.ShowCopyLog = obj.hasWarnings; + break; + } + case TorConnectTopics.BootstrapComplete: { + // tells about:torconnect pages to close themselves + // this flag will only be set if an about:torconnect page + // reaches the Bootstrapped state, so if a user + // navigates to about:torconnect manually after bootstrap, the page + // will not auto-close on them + self.state.Close = true; + break; + } + case TorConnectTopics.BootstrapError: { + self.state.ErrorMessage = obj.message; + self.state.ErrorDetails = obj.details; + self.state.ShowCopyLog = true; + break; + } + case TorConnectTopics.FatalError: { + // TODO: handle + break; + } + case "nsPref:changed": { + if (aData === TorLauncherPrefs.quickstart) { + self.state.QuickStartEnabled = Services.prefs.getBoolPref(TorLauncherPrefs.quickstart); + } + break; + } + default: { + console.log(`TorConnect: unhandled observe topic '${aTopic}'`); + } } + + self.sendAsyncMessage("torconnect:state-change", self.state); }, + }; + + // observe all of the torconnect:.* topics + for (const key in TorConnectTopics) { + const topic = TorConnectTopics[key]; + Services.obs.addObserver(this.torConnectObserver, topic); } - Services.prefs.addObserver(gTorLauncherPrefs.quickstart, this.quickstartObserver); + Services.prefs.addObserver(TorLauncherPrefs.quickstart, this.torConnectObserver); } willDestroy() { - for (const topic of gActiveTopics) { - Services.obs.removeObserver(this.gObserver, topic); + // stop observing all of our torconnect:.* topics + for (const key in TorConnectTopics) { + const topic = TorConnectTopics[key]; + Services.obs.removeObserver(this.torConnectObserver, topic); } - } - - - _OpenTorAdvancedPreferences() { - const win = this.browsingContext.top.embedderElement.ownerGlobal; - win.openTrustedLinkIn("about:preferences#tor", "tab"); - } - - _TorCopyLog() { - // Copy tor log messages to the system clipboard. - const chSvc = Cc["@mozilla.org/widget/clipboardhelper;1"].getService( - Ci.nsIClipboardHelper - ); - const countObj = { value: 0 }; - chSvc.copyString(TorProtocolService.getLog(countObj)); - const count = countObj.value; - return TorLauncherUtil.getFormattedLocalizedString( - "copiedNLogMessagesShort", - [count], - 1 - ); + Services.prefs.removeObserver(TorLauncherPrefs.quickstart, this.torConnectObserver); } receiveMessage(message) { switch (message.name) { - case "TorBootstrapErrorOccurred": - return TorProtocolService.torBootstrapErrorOccurred(); - case "TorRetrieveBootstrapStatus": - return TorProtocolService.retrieveBootstrapStatus(); - case "OpenTorAdvancedPreferences": - return this._OpenTorAdvancedPreferences(); - case "GetLocalizedBootstrapStatus": - const { status, keyword } = message.data; - return TorLauncherUtil.getLocalizedBootstrapStatus(status, keyword); - case "TorCopyLog": - return this._TorCopyLog(); - case "TorIsNetworkDisabled": - return TorProtocolService.isNetworkDisabled(); - case "TorStopBootstrap": - return TorProtocolService.torStopBootstrap(); - case "TorConnect": - return TorProtocolService.connect(); - case "GetDirection": - return Services.locale.isAppLocaleRTL ? "rtl" : "ltr"; - case "GetTorStrings": - return TorStrings; - case "TorLogHasWarnOrErr": - return TorProtocolService.torLogHasWarnOrErr(); + case "torconnect:set-quickstart": + Services.prefs.setBoolPref(TorLauncherPrefs.quickstart, message.data); + break; + case "torconnect:open-tor-preferences": + TorConnect.openTorPreferences(); + break; + case "torconnect:copy-tor-logs": + return TorConnect.copyTorLogs(); + case "torconnect:cancel-bootstrap": + TorConnect.cancelBootstrap(); + break; + case "torconnect:begin-bootstrap": + TorConnect.beginBootstrap(); + break; + case "torconnect:get-init-args": + // called on AboutTorConnect.init(), pass down all state data it needs to init + return { + TorStrings: TorStrings, + TorConnectState: TorConnectState, + Direction: Services.locale.isAppLocaleRTL ? "rtl" : "ltr", + State: this.state, + }; } return undefined; } diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js index 19fd335ccd13..8b269d2fc82b 100644 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@ -2,299 +2,258 @@ /* eslint-env mozilla/frame-script */ -const kTorProcessReadyTopic = "TorProcessIsReady"; -const kTorProcessExitedTopic = "TorProcessExited"; -const kTorProcessDidNotStartTopic = "TorProcessDidNotStart"; -const kTorBootstrapStatusTopic = "TorBootstrapStatus"; -const kTorBootstrapErrorTopic = "TorBootstrapError"; -const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; -const kTorQuickstartPrefChanged = "TorQuickstartPrefChanged"; - -const TorLauncherPrefs = { - quickstart: "extensions.torlauncher.quickstart", - prompt_at_startup: "extensions.torlauncher.prompt_at_startup", -} +// populated in AboutTorConnect.init() +let TorStrings = {}; +let TorConnectState = {}; class AboutTorConnect { - log(...args) { - console.log(...args); - } - - logError(...args) { - console.error(...args); - } + selectors = Object.freeze({ + textContainer: { + title: "div.title", + titleText: "h1.title-text", + }, + progress: { + description: "p#connectShortDescText", + meter: "div#progressBackground", + }, + copyLog: { + link: "span#copyLogLink", + tooltip: "div#copyLogTooltip", + tooltipText: "span#copyLogTooltipText", + }, + quickstart: { + checkbox: "input#quickstartCheckbox", + label: "label#quickstartCheckboxLabel", + }, + buttons: { + connect: "button#connectButton", + cancel: "button#cancelButton", + advanced: "button#advancedButton", + }, + }) + + elements = Object.freeze({ + title: document.querySelector(this.selectors.textContainer.title), + titleText: document.querySelector(this.selectors.textContainer.titleText), + progressDescription: document.querySelector(this.selectors.progress.description), + progressMeter: document.querySelector(this.selectors.progress.meter), + copyLogLink: document.querySelector(this.selectors.copyLog.link), + copyLogTooltip: document.querySelector(this.selectors.copyLog.tooltip), + copyLogTooltipText: document.querySelector(this.selectors.copyLog.tooltipText), + quickstartCheckbox: document.querySelector(this.selectors.quickstart.checkbox), + quickstartLabel: document.querySelector(this.selectors.quickstart.label), + connectButton: document.querySelector(this.selectors.buttons.connect), + cancelButton: document.querySelector(this.selectors.buttons.cancel), + advancedButton: document.querySelector(this.selectors.buttons.advanced), + }) + + beginBootstrap() { + this.hide(this.elements.connectButton); + this.show(this.elements.cancelButton); + this.elements.cancelButton.focus(); + RPMSendAsyncMessage("torconnect:begin-bootstrap"); + } + + cancelBootstrap() { + RPMSendAsyncMessage("torconnect:cancel-bootstrap"); + } + + /* + Element helper methods + */ + + show(element) { + element.removeAttribute("hidden"); + } + + hide(element) { + element.setAttribute("hidden", "true"); + } + + setTitle(title, error) { + this.elements.titleText.textContent = title; + document.title = title; - logDebug(...args) { - console.debug(...args); + if (error) { + this.elements.title.classList.add("error"); + } else { + this.elements.title.classList.remove("error"); + } } - getElem(id) { - return document.getElementById(id); - } - get elemProgressContent() { - return this.getElem("progressContent"); - } - get elemProgressDesc() { - return this.getElem("connectShortDescText"); - } - get elemProgressMeter() { - return this.getElem("progressBackground"); - } - get elemCopyLogLink() { - return this.getElem("copyLogLink"); - } - get elemCopyLogTooltip() { - return this.getElem("copyLogTooltip"); - } - get elemCopyLogTooltipText() { - return this.getElem("copyLogTooltipText"); - } - get elemQuickstartCheckbox() { - return this.getElem("quickstartCheckbox"); - } - get elemQuickstartLabel() { - return this.getElem("quickstartCheckboxLabel"); - } - get elemConnectButton() { - return this.getElem("connectButton"); - } - get elemAdvancedButton() { - return this.getElem("advancedButton"); - } - get elemCancelButton() { - return this.getElem("cancelButton"); - } - get elemTextContainer() { - return this.getElem("text-container"); - } - get elemTitle() { - return this.elemTextContainer.getElementsByClassName("title")[0]; + setProgress(description, visible, percent) { + this.elements.progressDescription.textContent = description; + if (visible) { + this.show(this.elements.progressMeter); + this.elements.progressMeter.style.width = `${percent}%`; + } else { + this.hide(this.elements.progressMeter); + } } - static get STATE_INITIAL() { - return "STATE_INITIAL"; - } + /* + These methods update the UI based on the current TorConnect state + */ - static get STATE_BOOTSTRAPPING() { - return "STATE_BOOTSTRAPPING"; - } + updateUI(state) { + console.log(state); - static get STATE_BOOTSTRAPPED() { - return "STATE_BOOTSTRAPPED"; - } + // calls update_$state() + this[`update_${state.State}`](state); - static get STATE_BOOTSTRAP_ERROR() { - return "STATE_BOOTSTRAP_ERROR"; + if (state.ShowCopyLog) { + this.showCopyLog(); + } + this.elements.quickstartCheckbox.checked = state.QuickStartEnabled; } - get state() { - return this._state; - } + /* Per-state updates */ - setInitialUI() { - this.setTitle(this.torStrings.torConnect.torConnect); - this.elemProgressDesc.textContent = - this.torStrings.settings.torPreferencesDescription; - this.showElem(this.elemConnectButton); - this.elemConnectButton.focus(); - this.showElem(this.elemAdvancedButton); - this.hideElem(this.elemCopyLogLink); - this.hideElem(this.elemCancelButton); - this.hideElem(this.elemProgressContent); - this.hideElem(this.elemProgressMeter); - this.elemTitle.classList.remove("error"); - } + update_Initial(state) { + const hasError = false; + const showProgressbar = false; - setBootstrappingUI() { - this.setTitle(this.torStrings.torConnect.torConnecting); - this.hideElem(this.elemConnectButton); - this.hideElem(this.elemAdvancedButton); - this.hideElem(this.elemCopyLogLink); - this.showElem(this.elemCancelButton); - this.elemCancelButton.focus(); - this.showElem(this.elemProgressContent); - this.showElem(this.elemProgressMeter); - this.elemTitle.classList.remove("error"); + this.setTitle(TorStrings.torConnect.torConnect, hasError); + this.setProgress(TorStrings.settings.torPreferencesDescription, showProgressbar); + this.hide(this.elements.copyLogLink); + this.hide(this.elements.connectButton); + this.hide(this.elements.advancedButton); + this.hide(this.elements.cancelButton); } - setBootstrapErrorUI() { - this.setTitle(this.torStrings.torConnect.torBootstrapFailed); - this.elemConnectButton.textContent = this.torStrings.torConnect.tryAgain; - this.showElem(this.elemConnectButton); - this.hideElem(this.elemCancelButton); - this.showElem(this.elemAdvancedButton); - this.elemAdvancedButton.focus(); - this.showElem(this.elemProgressContent); - this.hideElem(this.elemProgressMeter); - this.elemTitle.classList.add("error"); - } + update_Configuring(state) { + const hasError = state.ErrorMessage != null; + const showProgressbar = false; - set state(state) { - const oldState = this.state; - if (oldState === state) { - return; - } - this._state = state; - switch (this.state) { - case AboutTorConnect.STATE_INITIAL: - this.setInitialUI(); - break; - case AboutTorConnect.STATE_BOOTSTRAPPING: - this.setBootstrappingUI(); - break; - case AboutTorConnect.STATE_BOOTSTRAP_ERROR: - this.setBootstrapErrorUI(); - break; - case AboutTorConnect.STATE_BOOTSTRAPPED: - window.close(); - break; + if (hasError) { + this.setTitle(state.ErrorMessage, hasError); + this.setProgress(state.ErrorDetails, showProgressbar); + this.show(this.elements.copyLogLink); + this.elements.connectButton.textContent = TorStrings.torConnect.tryAgain; + } else { + this.setTitle(TorStrings.torConnect.torConnect, hasError); + this.setProgress(TorStrings.settings.torPreferencesDescription, showProgressbar); + this.hide(this.elements.copyLogLink); + this.elements.connectButton.textContent = TorStrings.torConnect.torConnectButton; } + this.show(this.elements.connectButton); + this.elements.connectButton.focus(); + this.show(this.elements.advancedButton); + this.hide(this.elements.cancelButton); } - async showErrorMessage(aErrorObj) { - if (aErrorObj && aErrorObj.message) { - this.setTitle(aErrorObj.message); - if (aErrorObj.details) { - this.elemProgressDesc.textContent = aErrorObj.details; - } - } - - this.showCopyLog(); - this.showElem(this.elemConnectButton); + update_AutoConfiguring(state) { + // TODO: noop until this state is used } - showElem(elem) { - elem.removeAttribute("hidden"); - } + update_Bootstrapping(state) { + const hasError = false; + const showProgressbar = true; - hideElem(elem) { - elem.setAttribute("hidden", "true"); + this.setTitle(state.BootstrapStatus ? state.BootstrapStatus : TorStrings.torConnect.torConnecting, hasError); + this.setProgress(TorStrings.settings.torPreferencesDescription, showProgressbar, state.BootstrapProgress); + if (state.ShowCopyLog) { + this.show(this.elements.copyLogLink); + } else { + this.hide(this.elements.copyLogLink); + } + this.hide(this.elements.connectButton); + this.hide(this.elements.advancedButton); + this.show(this.elements.cancelButton); + this.elements.cancelButton.focus(); } - async connect() { - // reset the text to original description - // in case we are trying again after an error (clears out error text) - this.elemProgressDesc.textContent = - this.torStrings.settings.torPreferencesDescription; + update_Error(state) { + const hasError = true; + const showProgressbar = false; - this.state = AboutTorConnect.STATE_BOOTSTRAPPING; - const error = await RPMSendQuery("TorConnect"); - if (error) { - if (error.details) { - this.showErrorMessage({ message: error.details }, true); - this.showSaveSettingsError(error.details); - } - } + this.setTitle(state.ErrorMessage, hasError); + this.setProgress(state.ErrorDetails, showProgressbar); + this.show(this.elements.copyLogLink); + this.elements.connectButton.textContent = TorStrings.torConnect.tryAgain; + this.show(this.elements.connectButton); + this.show(this.elements.advancedButton); + this.hide(this.elements.cancelButton); } - showCopyLog() { - this.elemCopyLogLink.removeAttribute("hidden"); + update_FatalError(state) { + // TODO: noop until this state is used } - async updateBootstrapProgress(status) { - let labelText = await RPMSendQuery("GetLocalizedBootstrapStatus", { - status, - keyword: "TAG", - }); - let percentComplete = status.PROGRESS ? status.PROGRESS : 0; - this.elemProgressMeter.style.width = `${percentComplete}%`; - - if (await RPMSendQuery("TorBootstrapErrorOccurred")) { - this.state = AboutTorConnect.STATE_BOOTSTRAP_ERROR; - return; - } else if (await RPMSendQuery("TorIsNetworkDisabled")) { - // If tor network is not connected, let's go to the initial state, even - // if bootstrap state is greater than 0. - this.state = AboutTorConnect.STATE_INITIAL; - return; - } else if (percentComplete > 0) { - this.state = AboutTorConnect.STATE_BOOTSTRAPPING; - } + update_Bootstrapped(state) { + const hasError = false; + const showProgressbar = true; - // Due to async, status might have changed. Do not override desc if so. - if (this.state === AboutTorConnect.STATE_BOOTSTRAPPING) { - this.hideElem(this.elemConnectButton); + this.setTitle(TorStrings.torConnect.torConnected, hasError); + this.setProgress(TorStrings.settings.torPreferencesDescription, showProgressbar, 100); + this.hide(this.elements.connectButton); + this.hide(this.elements.advancedButton); + this.hide(this.elements.cancelButton); + + // only close the window if directed + if (state.Close) { + window.close(); } } - stopTorBootstrap() { - RPMSendAsyncMessage("TorStopBootstrap"); + update_Disabled(state) { + // TODO: we should probably have some UX here if a user goes to about:torconnect when + // it isn't in use (eg using tor-launcher or system tor) } - setTitle(title) { - const titleElement = document.querySelector(".title-text"); - titleElement.textContent = title; - document.title = title; - } + async initElements(direction, quickstart) { - async initElements() { - this.elemAdvancedButton.textContent = this.torStrings.torConnect.torConfigure; - this.elemAdvancedButton.addEventListener("click", () => { - RPMSendAsyncMessage("OpenTorAdvancedPreferences"); - }); + document.documentElement.setAttribute("dir", direction); - // sets the text content while keping the child elements intact - this.elemCopyLogLink.childNodes[0].nodeValue = - this.torStrings.torConnect.copyLog; - this.elemCopyLogLink.addEventListener("click", async (event) => { - const copiedMessage = await RPMSendQuery("TorCopyLog"); - aboutTorConnect.elemCopyLogTooltipText.textContent = copiedMessage; - aboutTorConnect.elemCopyLogTooltip.style.visibility = "visible"; + // sets the text content while keeping the child elements intact + this.elements.copyLogLink.childNodes[0].nodeValue = + TorStrings.torConnect.copyLog; + this.elements.copyLogLink.addEventListener("click", async (event) => { + const copiedMessage = await RPMSendQuery("torconnect:copy-tor-logs"); + this.elements.copyLogTooltipText.textContent = copiedMessage; + this.elements.copyLogTooltipText.style.visibility = "visible"; // clear previous timeout if one already exists - if (aboutTorConnect.copyLogTimeoutId) { - clearTimeout(aboutTorConnect.copyLogTimeoutId); + if (this.copyLogTimeoutId) { + clearTimeout(this.copyLogTimeoutId); } // hide tooltip after X ms const TOOLTIP_TIMEOUT = 2000; - aboutTorConnect.copyLogTimeoutId = setTimeout(function() { - aboutTorConnect.elemCopyLogTooltip.style.visibility = "hidden"; - aboutTorConnect.copyLogTimeoutId = 0; + this.copyLogTimeoutId = setTimeout(function() { + this.elements.copyLogTooltipText.style.visibility = "hidden"; + this.copyLogTimeoutId = 0; }, TOOLTIP_TIMEOUT); }); + this.elements.quickstartCheckbox.checked = quickstart + this.elements.quickstartCheckbox.addEventListener("change", () => { + const quickstart = this.elements.quickstartCheckbox.checked; + RPMSendAsyncMessage("torconnect:set-quickstart", quickstart); + }); + this.elements.quickstartLabel.textContent = TorStrings.settings.quickstartCheckbox; - this.elemQuickstartLabel.textContent = this.torStrings.settings.quickstartCheckbox; - this.elemQuickstartCheckbox.addEventListener("change", () => { - const quickstart = this.elemQuickstartCheckbox.checked; - RPMSetBoolPref(TorLauncherPrefs.quickstart, quickstart); + this.elements.connectButton.textContent = + TorStrings.torConnect.torConnectButton; + this.elements.connectButton.addEventListener("click", () => { + this.beginBootstrap(); }); - this.elemQuickstartCheckbox.checked = await RPMGetBoolPref(TorLauncherPrefs.quickstart); - this.elemConnectButton.textContent = - this.torStrings.torConnect.torConnectButton; - this.elemConnectButton.addEventListener("click", () => { - this.connect(); + this.elements.advancedButton.textContent = TorStrings.torConnect.torConfigure; + this.elements.advancedButton.addEventListener("click", () => { + RPMSendAsyncMessage("torconnect:open-tor-preferences"); }); - this.elemCancelButton.textContent = this.torStrings.torConnect.cancel; - this.elemCancelButton.addEventListener("click", () => { - this.stopTorBootstrap(); + this.elements.cancelButton.textContent = TorStrings.torConnect.cancel; + this.elements.cancelButton.addEventListener("click", () => { + this.cancelBootstrap(); }); } initObservers() { - RPMAddMessageListener(kTorBootstrapErrorTopic, ({ data }) => { - this.showCopyLog(); - this.stopTorBootstrap(); - this.showErrorMessage(data); - }); - RPMAddMessageListener(kTorLogHasWarnOrErrTopic, () => { - this.showCopyLog(); - }); - RPMAddMessageListener(kTorProcessDidNotStartTopic, ({ data }) => { - this.showErrorMessage(data); - }); - RPMAddMessageListener(kTorBootstrapStatusTopic, ({ data }) => { - this.updateBootstrapProgress(data); - }); - RPMAddMessageListener(kTorQuickstartPrefChanged, ({ data }) => { - // update checkbox with latest quickstart pref value - this.elemQuickstartCheckbox.checked = data; - }); - RPMAddMessageListener("torconnect:bootstrap-complete", () => { - this.state = AboutTorConnect.STATE_BOOTSTRAPPED; + // TorConnectParent feeds us state blobs to we use to update our UI + RPMAddMessageListener("torconnect:state-change", ({ data }) => { + this.updateUI(data); }); } @@ -304,34 +263,25 @@ class AboutTorConnect { // integers, so we must resort to a string compare here :( // see https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/code for relevant documentation if (evt.code === "Escape") { - this.stopTorBootstrap(); + this.cancelBootstrap(); } }; } async init() { - this.torStrings = await RPMSendQuery("GetTorStrings"); - document.documentElement.setAttribute( - "dir", - await RPMSendQuery("GetDirection") - ); - this.initElements(); + + let args = await RPMSendQuery("torconnect:get-init-args"); + + // various constants + TorStrings = Object.freeze(args.TorStrings); + TorConnectState = Object.freeze(args.TorConnectState); + + this.initElements(args.Direction); this.initObservers(); this.initKeyboardShortcuts(); - this.state = AboutTorConnect.STATE_INITIAL; - - // Request the most recent bootstrap status info so that a - // TorBootstrapStatus notification is generated as soon as possible. - RPMSendAsyncMessage("TorRetrieveBootstrapStatus"); - - // quickstart is the user set pref for starting tor automatically - // prompt_at_startup will be set to false after successful bootstrap, and true on error - // by tor-launcher, so we want to keep the connect screen up when prompt_at_startup is true - /// even if quickstart is enabled so user can potentially resolve errors on next launch - if (await RPMGetBoolPref(TorLauncherPrefs.quickstart) && - !await RPMGetBoolPref(TorLauncherPrefs.prompt_at_startup)) { - this.connect(); - } + + // populate UI based on current state + this.updateUI(args.State); } } diff --git a/browser/components/torconnect/content/aboutTorConnect.xhtml b/browser/components/torconnect/content/aboutTorConnect.xhtml index 0a0721afb7db..595bbdf9a70a 100644 --- a/browser/components/torconnect/content/aboutTorConnect.xhtml +++ b/browser/components/torconnect/content/aboutTorConnect.xhtml @@ -19,15 +19,6 @@ </div> </div> - <div id="progressContent" hidden="true"> - <div class="tbb-header" pack="center"> - <image class="tbb-logo"/> - </div> - <div flex="1"> - <div id="progressDesc"/> - </div> - </div> - <div id="copyLogContainer"> <span id="copyLogLink" hidden="true"> <div id="copyLogTooltip"> diff --git a/browser/components/torconnect/content/torBootstrapUrlbar.js b/browser/components/torconnect/content/torBootstrapUrlbar.js index 55a595b2dbab..e4fd6f5ab910 100644 --- a/browser/components/torconnect/content/torBootstrapUrlbar.js +++ b/browser/components/torconnect/content/torBootstrapUrlbar.js @@ -2,135 +2,88 @@ "use strict"; - const TorConnectionStatus = { - invalid: -1, - offline: 0, - connecting: 1, - connected: 2, - failure: 3, - }; -var TorBootstrapUrlbar; +const { TorConnect, TorConnectTopics, TorConnectState } = ChromeUtils.import( + "resource:///modules/TorConnect.jsm" +); +const { TorStrings } = ChromeUtils.import( + "resource:///modules/TorStrings.jsm" +); -{ - const { TorProtocolService } = ChromeUtils.import( - "resource:///modules/TorProtocolService.jsm" - ); - const { TorLauncherUtil } = ChromeUtils.import( - "resource://torlauncher/modules/tl-util.jsm" - ); - const { TorStrings } = ChromeUtils.import( - "resource:///modules/TorStrings.jsm" - ); - - const kTorProcessReadyTopic = "TorProcessIsReady"; - const kTorProcessExitedTopic = "TorProcessExited"; - const kTorProcessDidNotStartTopic = "TorProcessDidNotStart"; - const kTorBootstrapStatusTopic = "TorBootstrapStatus"; - const kTorBootstrapErrorTopic = "TorBootstrapError"; - - const gActiveTopics = [ - kTorProcessReadyTopic, - kTorProcessExitedTopic, - kTorProcessDidNotStartTopic, - kTorBootstrapStatusTopic, - kTorBootstrapErrorTopic, - ]; - - TorBootstrapUrlbar = { - _connectionStatus: TorConnectionStatus.invalid, - get ConnectionStatus() { - return this._connectionStatus; +var TorBootstrapUrlbar = { + selectors: Object.freeze({ + torConnect: { + box: "hbox#torconnect-box", + label: "label#torconnect-label", }, + }), - _torConnectBox : null, - get TorConnectBox() { - if (!this._torConnectBox) { - this._torConnectBox = - browser.ownerGlobal.document.getElementById("torconnect-box"); - } - return this._torConnectBox; - }, + elements: null, - _torConnectLabel : null, - get TorConnectLabel() { - if (!this._torConnectLabel) { - this._torConnectLabel = - browser.ownerGlobal.document.getElementById("torconnect-label"); + updateTorConnectBox: function(state) { + switch(state) + { + case TorConnectState.Initial: + case TorConnectState.Configuring: + case TorConnectState.AutoConfiguring: + case TorConnectState.Error: + case TorConnectState.FatalError: { + this.elements.torConnectBox.removeAttribute("hidden"); + this.elements.torConnectLabel.textContent = TorStrings.torConnect.offline; + this.elements.inputContainer.setAttribute("torconnect", "offline"); + break; } - return this._torConnectLabel; - }, - - _updateConnectionStatus(percentComplete = 0) { - if (TorProtocolService.ownsTorDaemon && - !TorLauncherUtil.useLegacyLauncher) { - if (TorProtocolService.isNetworkDisabled()) { - if (TorProtocolService.torBootstrapErrorOccurred()) { - this._connectionStatus = TorConnectionStatus.failure; - } else { - this._connectionStatus = TorConnectionStatus.offline; - } - } else if (percentComplete < 100) { - this._connectionStatus = TorConnectionStatus.connecting; - } else if (percentComplete === 100) { - this._connectionStatus = TorConnectionStatus.connected; - } + case TorConnectState.Bootstrapping: { + this.elements.torConnectBox.removeAttribute("hidden"); + this.elements.torConnectLabel.textContent = + TorStrings.torConnect.torConnectingConcise; + this.elements.inputContainer.setAttribute("torconnect", "connecting"); + break; } - else - { - this._connectionStatus = TorConnectionStatus.invalid; + case TorConnectState.Bootstrapped: { + this.elements.torConnectBox.removeAttribute("hidden"); + this.elements.torConnectLabel.textContent = + TorStrings.torConnect.torConnectedConcise; + this.elements.inputContainer.setAttribute("torconnect", "connected"); + // hide torconnect box after 5 seconds + setTimeout(() => { + this.elements.torConnectBox.setAttribute("hidden", "true"); + }, 5000); + break; } - - switch(this._connectionStatus) - { - case TorConnectionStatus.failure: - case TorConnectionStatus.offline: - this.TorConnectBox.removeAttribute("hidden"); - this.TorConnectLabel.textContent = TorStrings.torConnect.offline; - gURLBar._inputContainer.setAttribute("torconnect", "offline"); - break; - case TorConnectionStatus.connecting: - this.TorConnectLabel.textContent = - TorStrings.torConnect.torConnectingConcise; - gURLBar._inputContainer.setAttribute("torconnect", "connecting"); - break; - case TorConnectionStatus.connected: - this.TorConnectLabel.textContent = - TorStrings.torConnect.torConnectedConcise; - gURLBar._inputContainer.setAttribute("torconnect", "connected"); - // hide torconnect box after 5 seconds - let self = this; - setTimeout(function() { - self.TorConnectBox.setAttribute("hidden", "true"); - }, 5000); - break; + case TorConnectState.Disabled: { + this.elements.torConnectBox.setAttribute("hidden", "true"); + break; } - }, + default: + break; + } + }, - observe(aSubject, aTopic, aData) { + observe: function(aSubject, aTopic, aData) { + if (aTopic === TorConnectTopics.StateChange) { const obj = aSubject?.wrappedJSObject; + this.updateTorConnectBox(obj?.state); + } + }, + + init: function() { + if (TorConnect.shouldShowTorConnect) { + // browser isn't populated until init + this.elements = Object.freeze({ + torConnectBox: browser.ownerGlobal.document.querySelector(this.selectors.torConnect.box), + torConnectLabel: browser.ownerGlobal.document.querySelector(this.selectors.torConnect.label), + inputContainer: gURLBar._inputContainer, + }) + Services.obs.addObserver(this, TorConnectTopics.StateChange); + this.observing = true; + this.updateTorConnectBox(TorConnect.state); + } + }, + + uninit: function() { + if (this.observing) { + Services.obs.removeObserver(this, TorConnectTopics.StateChange); + } + }, +}; - switch (aTopic) { - case kTorProcessReadyTopic: - case kTorProcessExitedTopic: - case kTorProcessDidNotStartTopic: - case kTorBootstrapErrorTopic: - this._updateConnectionStatus(); - break; - case kTorBootstrapStatusTopic: - let percentComplete = obj.PROGRESS ? obj.PROGRESS : 0; - this._updateConnectionStatus(percentComplete); - break; - } - }, - init() { - for (const topic of gActiveTopics) { - Services.obs.addObserver(this, topic); - } - }, - uninit() { - for (const topic of gActiveTopics) { - Services.obs.removeObserver(this, topic); - } - }, - }; -} diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index 01609ddda090..59ecdec6d1d9 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -6,6 +6,10 @@ const { TorProtocolService } = ChromeUtils.import( "resource:///modules/TorProtocolService.jsm" ); +const { TorConnect } = ChromeUtils.import( + "resource:///modules/TorConnect.jsm" +); + const { TorBridgeSource, TorBridgeSettings, @@ -188,14 +192,14 @@ const gTorPane = (function() { this._messageBoxButton = prefpane.querySelector(selectors.messageBox.button); // wire up connect button this._messageBoxButton.addEventListener("click", () => { - TorProtocolService.connect(); + TorConnect.beginBootstrap(); let win = Services.wm.getMostRecentWindow("navigator:browser"); // switch to existing about:torconnect tab or create a new one win.switchToTabHavingURI("about:torconnect", true); }); let populateMessagebox = () => { - if (TorProtocolService.shouldShowTorConnect()) { + if (TorConnect.shouldShowTorConnect) { // set messagebox style and text if (TorProtocolService.torBootstrapErrorOccurred()) { this._messageBox.className = "error"; diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm index f727c386701c..60b5b9163d67 100644 --- a/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm @@ -10,8 +10,8 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); -const { TorProtocolService } = ChromeUtils.import( - "resource:///modules/TorProtocolService.jsm" +const { TorConnect } = ChromeUtils.import( + "resource:///modules/TorConnect.jsm" ); // in certain scenarios we want user input uris to open in a new tab if they do so from the @@ -24,7 +24,7 @@ function maybeUpdateOpenLocationForTorConnect(openUILinkWhere, currentURI, desti // we are trying to open in same tab openUILinkWhere === "current" && // only if user still has not bootstrapped - TorProtocolService.shouldShowTorConnect() && + TorConnect.shouldShowTorConnect && // and user is not just navigating to about:torconnect destinationURI !== "about:torconnect") { return "tab"; diff --git a/browser/modules/TorConnect.jsm b/browser/modules/TorConnect.jsm index 3125c84558db..5d2b826cfa10 100644 --- a/browser/modules/TorConnect.jsm +++ b/browser/modules/TorConnect.jsm @@ -1,6 +1,6 @@ "use strict"; -var EXPORTED_SYMBOLS = ["TorConnect"]; +var EXPORTED_SYMBOLS = ["TorConnect", "TorConnectTopics", "TorConnectState"]; const { Services } = ChromeUtils.import( "resource://gre/modules/Services.jsm" @@ -10,53 +10,476 @@ const { BrowserWindowTracker } = ChromeUtils.import( "resource:///modules/BrowserWindowTracker.jsm" ); -const { TorProtocolService } = ChromeUtils.import( +const { TorProtocolService, TorProcessStatus } = ChromeUtils.import( "resource:///modules/TorProtocolService.jsm" ); -// TODO: move the bootstrap state management out of each of the individual -// about:torconnect pages and stick it here -var TorConnect = (() => { +const { TorLauncherUtil } = ChromeUtils.import( + "resource://torlauncher/modules/tl-util.jsm" +); + +/* Browser observer topis */ +const BrowserTopics = Object.freeze({ + ProfileAfterChange: "profile-after-change", +}); + +/* tor-launcher observer topics */ +const TorTopics = Object.freeze({ + ProcessIsReady: "TorProcessIsReady", + BootstrapStatus: "TorBootstrapStatus", + BootstrapError: "TorBootstrapError", + ProcessExited: "TorProcessExited", + LogHasWarnOrErr: "TorLogHasWarnOrErr", +}); + +/* Relevant prefs used by tor-launcher */ +const TorLauncherPrefs = Object.freeze({ + quickstart: "extensions.torlauncher.quickstart", + prompt_at_startup: "extensions.torlauncher.prompt_at_startup", +}); + +const TorConnectState = Object.freeze({ + /* Our initial state */ + Initial: "Initial", + /* In-between initial boot and bootstrapping, users can change tor network settings during this state */ + Configuring: "Configuring", + /* Geo-location and setting bridges/etc */ + AutoConfiguring: "AutoConfiguring", + /* Tor is bootstrapping */ + Bootstrapping: "Bootstrapping", + /* Passthrough state back to Configuring or Fatal */ + Error: "Error", + /* An unrecoverable error */ + FatalError: "FatalError", + /* Final state, after successful bootstrap */ + Bootstrapped: "Bootstrapped", + /* If we are using System tor or the legacy Tor-Launcher */ + Disabled: "Disabled", +}); + +/* + + TorConnect State Transitions + + ┌──────────────────────┐ + │ Disabled │ + └──────────────────────┘ + ▲ + │ legacyOrSystemTor() + │ + ┌──────────────────────┐ + ┌────────────────────── │ Initial │ ───────────────────────────┐ + │ └──────────────────────┘ │ + │ │ │ + │ │ beginBootstrap() │ + │ ▼ │ +┌────────────────┐ │ bootstrapComplete() ┌────────────────────────────────────────────────┐ │ beginBootstrap() +│ Bootstrapped │ ◀──┼────────────────────── │ Bootstrapping │ ◀┼─────────────────┐ +└────────────────┘ │ └────────────────────────────────────────────────┘ │ │ + │ │ ▲ │ │ │ + │ │ cancelBootstrap() │ beginBootstrap() └────┼─────────────┐ │ + │ ▼ │ │ │ │ + │ beginConfigure() ┌────────────────────────────────────────────────┐ │ │ │ + └─────────────────────▶ │ │ │ │ │ + │ │ │ │ │ + beginConfigure() │ │ │ │ │ + ┌──────────────────────────▶ │ Configuring │ │ │ │ + │ │ │ │ │ │ + │ │ │ │ │ │ + │ ┌─────────────────────▶ │ │ │ │ │ + │ │ └────────────────────────────────────────────────┘ │ │ │ + │ │ │ │ │ │ │ + │ │ cancelAutoconfigure() │ autoConfigure() │ ┌────┼─────────────┼───┘ + │ │ ▼ │ │ │ │ + │ │ ┌──────────────────────┐ │ │ │ │ + │ └────────────────────── │ AutoConfiguring │ ─┼────────────────────┘ │ │ + │ └──────────────────────┘ │ │ │ + │ │ │ │ onError() │ + │ │ onError() │ onError() │ │ + │ ▼ ▼ │ │ + │ ┌────────────────────────────────────────────────┐ │ │ + └─────────────────────────── │ Error │ ◀┘ │ + └────────────────────────────────────────────────┘ │ + │ ▲ onError() │ + │ onFatalError() └──────────────────┘ + ▼ + ┌──────────────────────┐ + │ FatalError │ + └──────────────────────┘ + +*/ + + +/* Maps allowed state transitions + TorConnectStateTransitions[state] maps to an array of allowed states to transition to +*/ +const TorConnectStateTransitions = + Object.freeze(new Map([ + [TorConnectState.Initial, + [TorConnectState.Disabled, + TorConnectState.Bootstrapping, + TorConnectState.Configuring, + TorConnectState.Error]], + [TorConnectState.Configuring, + [TorConnectState.AutoConfiguring, + TorConnectState.Bootstrapping, + TorConnectState.Error]], + [TorConnectState.AutoConfiguring, + [TorConnectState.Configuring, + TorConnectState.Bootstrapping, + TorConnectState.Error]], + [TorConnectState.Bootstrapping, + [TorConnectState.Configuring, + TorConnectState.Bootstrapped, + TorConnectState.Error]], + [TorConnectState.Error, + [TorConnectState.Configuring, + TorConnectState.FatalError]], + // terminal states + [TorConnectState.FatalError, []], + [TorConnectState.Bootstrapped, []], + [TorConnectState.Disabled, []], + ])); + +/* Topics Notified by the TorConnect module */ +const TorConnectTopics = Object.freeze({ + StateChange: "torconnect:state-change", + BootstrapProgress: "torconnect:bootstrap-progress", + BootstrapComplete: "torconnect:bootstrap-complete", + BootstrapError: "torconnect:bootstrap-error", + FatalError: "torconnect:fatal-error", +}); + +const TorConnect = (() => { let retval = { - init : function() { - let topics = [ - "TorBootstrapStatus", - ]; - for(const topic of topics) { - Services.obs.addObserver(this, topic); + _state: TorConnectState.Initial, + _bootstrapProgress: 0, + _bootstrapStatus: null, + _errorMessage: null, + _errorDetails: null, + _logHasWarningOrError: false, + // init to about:tor as fallback in case setURIsToLoad is somehow never called + _urisToLoad: ["about:tor"], + + /* These functions are called after transitioning to a new state */ + _transitionCallbacks: Object.freeze(new Map([ + /* Initial is never transitioned to */ + [TorConnectState.Initial, null], + /* Configuring */ + [TorConnectState.Configuring, (self) => { + // TODO move this to the transition function + if (this._state === TorConnectState.Bootstrapping) { + TorProtocolService.torStopBootstrap(); + } + }], + /* AutoConfiguring */ + [TorConnectState.AutoConfiguring, (self) => { + + }], + /* Bootstrapping */ + [TorConnectState.Bootstrapping, (self) => { + let error = TorProtocolService.connect(); + if (error) { + self.onError(error.message, error.details); + } else { + self._errorMessage = self._errorDetails = null; + } + }], + /* Bootstrapped */ + [TorConnectState.Bootstrapped, (self) => { + // open home page(s) in new tabs + const win = BrowserWindowTracker.getTopWindow() + + let location="tab"; + for (const uri of self._urisToLoad) { + win.openTrustedLinkIn(uri, location); + // open subsequent tabs behind first tab + location = "tabshifted"; + } + Services.obs.notifyObservers(null, TorConnectTopics.BootstrapComplete); + }], + /* Error */ + [TorConnectState.Error, (self, errorMessage, errorDetails, fatal) => { + self._errorMessage = errorMessage; + self._errorDetails = errorDetails; + + Services.obs.notifyObservers({message: errorMessage, details: errorDetails}, TorConnectTopics.BootstrapError); + if (fatal) { + self.onFatalError(); + } else { + self.beginConfigure(); + } + }], + /* FatalError */ + [TorConnectState.FatalError, (self) => { + Services.obs.notifyObservers(null, TorConnectTopics.FatalError); + }], + /* Disabled */ + [TorConnectState.Disabled, (self) => { + + }], + ])), + + _changeState: function(newState, ...args) { + const oldState = this._state; + + // ensure this is a valid state transition + if (!TorConnectStateTransitions.get(oldState)?.includes(newState)) { + throw Error(`TorConnect: Attempted invalid state transition from ${oldState} to ${newState}`); } + + console.log(`TorConnect: transitioning state from ${oldState} to ${newState}`); + + // call our transition function and forward any args + this._transitionCallbacks.get(newState)(this, ...args); + + // finally, set our new state + this._state = newState; + + Services.obs.notifyObservers({state: newState}, TorConnectTopics.StateChange); + }, + + // init should be called on app-startup in MainProcessingSingleton.jsm + init : function() { + console.log("TorConnect: Init"); + + // delay remaining init until after profile-after-change + Services.obs.addObserver(this, BrowserTopics.ProfileAfterChange); }, observe: function(subject, topic, data) { + console.log(`TorConnect: observed ${topic}`); + switch(topic) { - case "TorBootstrapStatus": - const obj = subject?.wrappedJSObject; - if (obj?.PROGRESS === 100) { - // open home page(s) in new tabs - const win = BrowserWindowTracker.getTopWindow() - const urls = Services.prefs.getStringPref("browser.startup.homepage").split('|'); - - let location="tab"; - for(const url of urls) { - win.openTrustedLinkIn(url, location); - // open subsequent tabs behind first tab - location = "tabshifted"; + + /* Determine which state to move to from Initial */ + case BrowserTopics.ProfileAfterChange: { + if (TorLauncherUtil.useLegacyLauncher || !TorProtocolService.ownsTorDaemon) { + // Disabled + this.legacyOrSystemTor(); + } else { + // register the Tor topics we always care about + for (const topicKey in TorTopics) { + const topic = TorTopics[topicKey]; + Services.obs.addObserver(this, topic); + console.log(`TorConnect: observing topic '${topic}'`); } - Services.obs.notifyObservers(null, "torconnect:bootstrap-complete"); + if (TorProtocolService.torProcessStatus == TorProcessStatus.Running) { + if (this.shouldQuickStart) { + // Quickstart + this.beginBootstrap(); + } else { + // Configuring + this.beginConfigure(); + } + } } + + Services.obs.removeObserver(this, topic); break; + } + /* Transition out of Initial if Tor daemon wasn't running yet in BrowserTopics.ProfileAfterChange */ + case TorTopics.ProcessIsReady: { + if (this.state === TorConnectState.Initial) + { + if (this.shouldQuickStart) { + // Quickstart + this.beginBootstrap(); + } else { + // Configuring + this.beginConfigure(); + } + } + break; + } + /* Updates our bootstrap status */ + case TorTopics.BootstrapStatus: { + if (this._state != TorConnectState.Bootstrapping) { + console.log(`TorConnect: observed ${TorTopics.BootstrapStatus} topic while in state TorConnectState.${this._state}`); + break; + } + + const obj = subject?.wrappedJSObject; + if (obj) { + this._bootstrapProgress= obj.PROGRESS; + this._bootstrapStatus = TorLauncherUtil.getLocalizedBootstrapStatus(obj, "TAG"); + + console.log(`TorConnect: Bootstrapping ${this._bootstrapProgress}% complete (${this._bootstrapStatus})`); + Services.obs.notifyObservers({ + progress: this._bootstrapProgress, + status: this._bootstrapStatus, + hasWarnings: this._logHasWarningOrError + }, TorConnectTopics.BootstrapProgress); + + if (this._bootstrapProgress === 100) { + this.bootstrapComplete(); + } + } + break; + } + /* Handle bootstrap error*/ + case TorTopics.BootstrapError: { + const obj = subject?.wrappedJSObject; + TorProtocolService.torStopBootstrap(); + this.onError(obj.message, obj.details); + break; + } + case TorTopics.LogHasWarnOrErr: { + this._logHasWarningOrError = true; + break; + } default: // ignore break; } }, - shouldShowTorConnect : function() { - return TorProtocolService.shouldShowTorConnect(); + /* + Various getters + */ + + get shouldShowTorConnect() { + // TorBrowser must control the daemon + return (TorProtocolService.ownsTorDaemon && + // and we're not using the legacy launcher + !TorLauncherUtil.useLegacyLauncher && + // legacy checks, TODO: maybe this should be in terms of our own state? + (TorProtocolService.isNetworkDisabled() || !TorProtocolService.isBootstrapDone())); + }, + + get shouldQuickStart() { + // quickstart must be enabled + return Services.prefs.getBoolPref(TorLauncherPrefs.quickstart, false) && + // and the previous bootstrap attempt must have succeeded + !Services.prefs.getBoolPref(TorLauncherPrefs.prompt_at_startup, true); + }, + + get state() { + return this._state; + }, + + get bootstrapProgress() { + return this._bootstrapProgress; + }, + + get bootstrapStatus() { + return this._bootstrapStatus; + }, + + get errorMessage() { + return this._errorMessage; + }, + + get errorDetails() { + return this._errorDetails; + }, + + get logHasWarningOrError() { + return this._logHasWarningOrError; + }, + + /* + These functions tell TorConnect to transition states + */ + + legacyOrSystemTor: function() { + console.log("TorConnect: legacyOrSystemTor()"); + this._changeState(TorConnectState.Disabled); + }, + + beginBootstrap: function() { + console.log("TorConnect: beginBootstrap()"); + this._changeState(TorConnectState.Bootstrapping); + }, + + beginConfigure: function() { + console.log("TorConnect: beginConfigure()"); + this._changeState(TorConnectState.Configuring); + }, + + autoConfigure: function() { + console.log("TorConnect: autoConfigure()"); + // TODO: implement + throw Error("TorConnect: not implemented"); + }, + + cancelAutoConfigure: function() { + console.log("TorConnect: cancelAutoConfigure()"); + // TODO: implement + throw Error("TorConnect: not implemented"); + }, + + cancelBootstrap: function() { + console.log("TorConnect: cancelBootstrap()"); + this._changeState(TorConnectState.Configuring); + }, + + bootstrapComplete: function() { + console.log("TorConnect: bootstrapComplete()"); + this._changeState(TorConnectState.Bootstrapped); + }, + + onError: function(message, details) { + console.log("TorConnect: onError()"); + this._changeState(TorConnectState.Error, message, details, false); + }, + + onFatalError: function() { + console.log("TorConnect: onFatalError()"); + // TODO: implement + throw Error("TorConnect: not implemented"); + }, + + /* + Further external commands and helper methods + */ + openTorPreferences: function() { + const win = BrowserWindowTracker.getTopWindow() + win.openTrustedLinkIn("about:preferences#tor", "tab"); + }, + + copyTorLogs: function() { + // Copy tor log messages to the system clipboard. + const chSvc = Cc["@mozilla.org/widget/clipboardhelper;1"].getService( + Ci.nsIClipboardHelper + ); + const countObj = { value: 0 }; + chSvc.copyString(TorProtocolService.getLog(countObj)); + const count = countObj.value; + return TorLauncherUtil.getFormattedLocalizedString( + "copiedNLogMessagesShort", + [count], + 1 + ); + }, + + // called from browser.js on browser startup, passed in either the user's homepage(s) + // or uris passed via command-line + setURIsToLoad: function(uriVariant) { + // convert the object we get from browser.js + let uris = ((v) => { + if (v instanceof Ci.nsIArray) { + // Transform the nsIArray of nsISupportsString's into a JS Array of + // JS strings. + return Array.from( + v.enumerate(Ci.nsISupportsString), + supportStr => supportStr.data + ); + } else if (v instanceof Ci.nsISupportsString) { + return [v.data]; + } else if (typeof v === "string") { + return v.split("|"); + } + // about:tor as safe fallback + return ["about:tor"]; + })(uriVariant); + + console.log(`TorConnect: will load after bootstrap => ${uris.join(", ")}`); + this._urisToLoad = uris; }, }; retval.init(); return retval; -})(); /* TorConnect */ \ No newline at end of file +})(); /* TorConnect */ diff --git a/browser/modules/TorProtocolService.jsm b/browser/modules/TorProtocolService.jsm index fc7f2c884aa2..e6c78b9a0eb1 100644 --- a/browser/modules/TorProtocolService.jsm +++ b/browser/modules/TorProtocolService.jsm @@ -2,26 +2,59 @@ "use strict"; -var EXPORTED_SYMBOLS = ["TorProtocolService"]; +var EXPORTED_SYMBOLS = ["TorProtocolService", "TorProcessStatus"]; -const { TorLauncherUtil } = ChromeUtils.import( - "resource://torlauncher/modules/tl-util.jsm" +const { Services } = ChromeUtils.import( + "resource://gre/modules/Services.jsm" ); -var TorProtocolService = { - _tlps: Cc["@torproject.org/torlauncher-protocol-service;1"].getService( - Ci.nsISupports - ).wrappedJSObject, +// see tl-process.js +const TorProcessStatus = Object.freeze({ + Unknown: 0, + Starting: 1, + Running: 2, + Exited: 3, +}); + +/* Browser observer topis */ +const BrowserTopics = Object.freeze({ + ProfileAfterChange: "profile-after-change", +}); - _tlproc: Cc["@torproject.org/torlauncher-process-service;1"].getService( - Ci.nsISupports - ).wrappedJSObject, +var TorProtocolService = { + _TorLauncherUtil: function() { + let { TorLauncherUtil } = ChromeUtils.import( + "resource://torlauncher/modules/tl-util.jsm" + ); + return TorLauncherUtil; + }(), + _TorLauncherProtocolService: null, + _TorProcessService: null, // maintain a map of tor settings set by Tor Browser so that we don't // repeatedly set the same key/values over and over // this map contains string keys to primitive or array values _settingsCache: new Map(), + init() { + Services.obs.addObserver(this, BrowserTopics.ProfileAfterChange); + }, + + observe(subject, topic, data) { + if (topic === BrowserTopics.ProfileAfterChange) { + // we have to delay init'ing this or else the crypto service inits too early without a profile + // which breaks the password manager + this._TorLauncherProtocolService = Cc["@torproject.org/torlauncher-protocol-service;1"].getService( + Ci.nsISupports + ).wrappedJSObject; + this._TorProcessService = Cc["@torproject.org/torlauncher-process-service;1"].getService( + Ci.nsISupports + ).wrappedJSObject, + + Services.obs.removeObserver(this, topic); + } + }, + _typeof(aValue) { switch (typeof aValue) { case "boolean": @@ -124,7 +157,7 @@ var TorProtocolService = { } let errorObject = {}; - if (!this._tlps.TorSetConfWithReply(settingsObject, errorObject)) { + if (!this._TorLauncherProtocolService.TorSetConfWithReply(settingsObject, errorObject)) { throw new Error(errorObject.details); } @@ -137,8 +170,8 @@ var TorProtocolService = { _readSetting(aSetting) { this._assertValidSettingKey(aSetting); - let reply = this._tlps.TorGetConf(aSetting); - if (this._tlps.TorCommandSucceeded(reply)) { + let reply = this._TorLauncherProtocolService.TorGetConf(aSetting); + if (this._TorLauncherProtocolService.TorCommandSucceeded(reply)) { return reply.lineArray; } throw new Error(reply.lineArray.join("\n")); @@ -207,22 +240,22 @@ var TorProtocolService = { getLog(countObj) { countObj = countObj || { value: 0 }; - let torLog = this._tlps.TorGetLog(countObj); + let torLog = this._TorLauncherProtocolService.TorGetLog(countObj); return torLog; }, // true if we launched and control tor, false if using system tor get ownsTorDaemon() { - return TorLauncherUtil.shouldStartAndOwnTor; + return this._TorLauncherUtil.shouldStartAndOwnTor; }, // Assumes `ownsTorDaemon` is true isNetworkDisabled() { - const reply = TorProtocolService._tlps.TorGetConfBool( + const reply = TorProtocolService._TorLauncherProtocolService.TorGetConfBool( "DisableNetwork", true ); - if (TorProtocolService._tlps.TorCommandSucceeded(reply)) { + if (TorProtocolService._TorLauncherProtocolService.TorCommandSucceeded(reply)) { return reply.retVal; } return true; @@ -232,22 +265,22 @@ var TorProtocolService = { let settings = {}; settings.DisableNetwork = false; let errorObject = {}; - if (!this._tlps.TorSetConfWithReply(settings, errorObject)) { + if (!this._TorLauncherProtocolService.TorSetConfWithReply(settings, errorObject)) { throw new Error(errorObject.details); } }, sendCommand(cmd) { - return this._tlps.TorSendCommand(cmd); + return this._TorLauncherProtocolService.TorSendCommand(cmd); }, retrieveBootstrapStatus() { - return this._tlps.TorRetrieveBootstrapStatus(); + return this._TorLauncherProtocolService.TorRetrieveBootstrapStatus(); }, _GetSaveSettingsErrorMessage(aDetails) { try { - return TorLauncherUtil.getSaveSettingsErrorMessage(aDetails); + return this._TorLauncherUtil.getSaveSettingsErrorMessage(aDetails); } catch (e) { console.log("GetSaveSettingsErrorMessage error", e); return "Unexpected Error"; @@ -258,7 +291,7 @@ var TorProtocolService = { let result = false; const error = {}; try { - result = this._tlps.TorSetConfWithReply(settings, error); + result = this._TorLauncherProtocolService.TorSetConfWithReply(settings, error); } catch (e) { console.log("TorSetConfWithReply error", e); error.details = this._GetSaveSettingsErrorMessage(e.message); @@ -267,23 +300,15 @@ var TorProtocolService = { }, isBootstrapDone() { - return this._tlproc.mIsBootstrapDone; + return this._TorProcessService.mIsBootstrapDone; }, clearBootstrapError() { - return this._tlproc.TorClearBootstrapError(); - }, - - shouldShowTorConnect() { - return ( - this.ownsTorDaemon && - !TorLauncherUtil.useLegacyLauncher && - (this.isNetworkDisabled() || !this.isBootstrapDone()) - ); + return this._TorProcessService.TorClearBootstrapError(); }, torBootstrapErrorOccurred() { - return this._tlproc.TorBootstrapErrorOccurred; + return this._TorProcessService.TorBootstrapErrorOccurred; }, // Resolves to null if ok, or an error otherwise @@ -306,7 +331,7 @@ var TorProtocolService = { }, torLogHasWarnOrErr() { - return this._tlps.TorLogHasWarnOrErr; + return this._TorLauncherProtocolService.TorLogHasWarnOrErr; }, torStopBootstrap() { @@ -327,4 +352,12 @@ var TorProtocolService = { } this.retrieveBootstrapStatus(); }, + + get torProcessStatus() { + if (this._TorProcessService) { + return this._TorProcessService.TorProcessStatus; + } + return TorProcessStatus.Unknown; + }, }; +TorProtocolService.init(); \ No newline at end of file diff --git a/toolkit/components/processsingleton/MainProcessSingleton.jsm b/toolkit/components/processsingleton/MainProcessSingleton.jsm index db1e2dc8f568..ea9288dccbb3 100644 --- a/toolkit/components/processsingleton/MainProcessSingleton.jsm +++ b/toolkit/components/processsingleton/MainProcessSingleton.jsm @@ -24,6 +24,11 @@ MainProcessSingleton.prototype = { null ); + ChromeUtils.import( + "resource:///modules/TorConnect.jsm", + null + ); + // Load this script early so that console.* is initialized // before other frame scripts. Services.mm.loadFrameScript( diff --git a/toolkit/modules/RemotePageAccessManager.jsm b/toolkit/modules/RemotePageAccessManager.jsm index 0927391c2ba7..54230e1175ec 100644 --- a/toolkit/modules/RemotePageAccessManager.jsm +++ b/toolkit/modules/RemotePageAccessManager.jsm @@ -181,28 +181,18 @@ let RemotePageAccessManager = { RPMRemoveMessageListener: ["*"], }, "about:torconnect": { - RPMAddMessageListener: ["*"], + RPMAddMessageListener: [ + "torconnect:state-change", + ], RPMSendAsyncMessage: [ - "OpenTorAdvancedPreferences", - "TorRetrieveBootstrapStatus", - "TorStopBootstrap", + "torconnect:open-tor-preferences", + "torconnect:begin-bootstrap", + "torconnect:cancel-bootstrap", + "torconnect:set-quickstart", ], RPMSendQuery: [ - "GetDirection", - "GetLocalizedBootstrapStatus", - "GetTorStrings", - "TorBootstrapErrorOccurred", - "TorConnect", - "TorCopyLog", - "TorIsNetworkDisabled", - "TorLogHasWarnOrErr", - ], - RPMGetBoolPref: [ - "extensions.torlauncher.quickstart", - "extensions.torlauncher.prompt_at_startup", - ], - RPMSetBoolPref: [ - "extensions.torlauncher.quickstart", + "torconnect:get-init-args", + "torconnect:copy-tor-logs", ], }, },

1 0

[tor-browser/tor-browser-78.12.0esr-11.0-1] Merge remote-tracking branch 'richardgl/geolocation_refactor' into tor-browser-78.12.0esr-11.0-1
by sysrqb＠torproject.org 22 Jul '21

22 Jul '21

commit d54c4f1cf20e6166280e37567f7fa362ec596923 Merge: 1eaade2adee6 73d57c01c2bf Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jul 22 17:45:34 2021 +0000 Merge remote-tracking branch 'richardgl/geolocation_refactor' into tor-browser-78.12.0esr-11.0-1 browser/actors/NetErrorParent.jsm | 6 +- browser/base/content/browser.js | 5 +- browser/components/BrowserGlue.jsm | 32 +- browser/components/torconnect/TorConnectParent.jsm | 200 +++++---- .../torconnect/content/aboutTorConnect.js | 466 +++++++++----------- .../torconnect/content/aboutTorConnect.xhtml | 9 - .../torconnect/content/torBootstrapUrlbar.js | 195 ++++----- .../components/torpreferences/content/torPane.js | 8 +- browser/components/urlbar/UrlbarInput.jsm | 6 +- browser/modules/TorConnect.jsm | 477 +++++++++++++++++++-- browser/modules/TorProtocolService.jsm | 101 +++-- .../processsingleton/MainProcessSingleton.jsm | 5 + toolkit/modules/RemotePageAccessManager.jsm | 28 +- 13 files changed, 941 insertions(+), 597 deletions(-)

1 0

[tor-browser-build/maint-10.5] Bug 40312: Update components for mozilla90: fenix part
by sysrqb＠torproject.org 16 Jul '21

16 Jul '21

1 0

[tor-browser-build/maint-10.5] Tor Browser 10.5.3 release preparations
by sysrqb＠torproject.org 16 Jul '21

16 Jul '21

commit 81d253edf7b21c9e9803f0fe0c92625281333c53 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Jul 16 13:24:29 2021 +0000 Tor Browser 10.5.3 release preparations Version bumps and Changelog update --- projects/android-components/config | 4 +- .../gradle-dependencies-list.txt | 4 +- projects/fenix/config | 6 +- projects/fenix/gradle-dependencies-list.txt | 352 ++++++++++----------- projects/geckoview/config | 2 +- projects/https-everywhere/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 13 + projects/tor-browser/allowed_addons.json | 198 ++++++------ rbm.conf | 2 +- 9 files changed, 298 insertions(+), 285 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 060a927..dab6800 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -8,12 +8,12 @@ gpg_keyring: torbutton.gpg variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]' var: - android_components_version: 90.0.11 + android_components_version: 90.0.12 torbrowser_branch: 10.5 container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 26 + gradle_dependencies_version: 27 gradle_version: 6.6.1 glean_parser: 3.2.0 git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' diff --git a/projects/android-components/gradle-dependencies-list.txt b/projects/android-components/gradle-dependencies-list.txt index 1118f17..a26b641 100644 --- a/projects/android-components/gradle-dependencies-list.txt +++ b/projects/android-components/gradle-dependencies-list.txt @@ -387,8 +387,8 @@ e99477265ee7b3fd8c8c5d5a8a3e0b5372dfffb8b55aa037e03b5520a590c63c | https://maven d5bc8b9ee51c1c99fb9d9f0a1ad5971f20d8ebca5f65ab0a511d2e68a7058ce3 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/75.0.0/… 3a8be5803d69f1c27f1c6be686b4693ed2ad815992240540e78713043b2442d0 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/75.0.… 7f2a2ee5be870a21ac6ef982ac76869d15c707b9771a54aac9ab602f74d99b86 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/75.0.… -4bac410c8dbd792933a1e03e980a67fb41a5f0ec164836eb2c5e47e9a8157f8f | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/90.0.… -192631dbca16d4cb03f4f8b4913f79e4ec2fe01877c03a4e0c7b485346f0a26f | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/90.0.… +6918bb8864d4e066412edaf0f4771fdd4309a4197436d59735e6956efed4c766 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/90.0.20210… +c5de862f7feca6dc70dad5120ba780e85ff53203939338845d53dffac157f2f0 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/90.0.20210… 8f8856f00b005a719e75759a2cdcf6cd8ef30b9a65ade3086f713644e7acabbf | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… 7016d5e5b17bf8c778d15e77dc0e543e2fff2d97675053b03e01219ebf6c70b7 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… c1316aeabddcde013f52f0a49fc147becfe10621fefb6afe09fd814886c7ecf5 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… diff --git a/projects/fenix/config b/projects/fenix/config index 8eee3e8..146290c 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -1,21 +1,21 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build1' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg variant: Release var: - fenix_version: 90.0.0b6 + fenix_version: 90.1.1 torbrowser_branch: 10.5 git_branch: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. - gradle_dependencies_version: 28 + gradle_dependencies_version: 29 gradle_version: 6.5.1 glean_parser: 3.2.0 diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt index ad2f948..cae263d 100644 --- a/projects/fenix/gradle-dependencies-list.txt +++ b/projects/fenix/gradle-dependencies-list.txt @@ -377,182 +377,182 @@ cb1aa6bbb2193af67f2c4c5953b88ec42f253df6423c61f3ef050bdcd1894191 | https://maven 9433932729312495ab30a98bb15187d9ee1169596eee483bcc7727593083e0c1 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/77.0.2… 4028179e210302582f9d2e91215fa2455b372a00cdea64b3e2a50db824c69018 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/77.0.2/tabs-7… 2e8e9b245228a38f8e3ba4a41dc09b17359da45097fac978e08155ca27cf2ddd | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/77.0.2/tabs-7… -9c5694be50d20bf7c1dcb29eaf148ed672f9d362bd72f2b158ecbf1a02691316 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-awesomebar/… -f589b665c4826dd2887a707492d7aa35ae62e7e20e68b1710ebbcc9aa4e43205 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-awesomebar/… -c404ac90f6d24d17099ed1bbee57057f11ddf012356da0132901c2fd56c4a48d | https://maven.mozilla.org/maven2/org/mozilla/components/browser-domains/90.… -c6fcdd7eab9d718644171e5f604ad167be5885528783547108623cc994db1764 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-domains/90.… -dc2097e0c65d8abb91d6019da2ed48dd18c1e5031a0342202c2acfb50775abee | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… -86c45b59c7263900d5b6c982eeee5505168afef4acc521231bd2f9c2233372ff | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… -62e7ee9fc2344c3536f2daad81e086a8fcd5cb0d670f84769378567bd393f5e6 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-errorpages/… -a272f0c9c586f89dbad9ae9ecf181f0291551867da464b306a281b05935120cb | https://maven.mozilla.org/maven2/org/mozilla/components/browser-errorpages/… -e66fdac6967846ff6ebcce48958618f4672643ace5a70e350ec6869bd26abe80 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-icons/90.0.… -6599ed5ac510a29c1d1cf31ce056ca4a70c8f8ea48c90169673112c1276904bc | https://maven.mozilla.org/maven2/org/mozilla/components/browser-icons/90.0.… -0513f2ecbbfdbe55f65f997b07ac90c95e0678fd9622c8ea33ed7b92cdc3920e | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu/90.0.1… -0383f4735406d0d433c2d6b0709d774d8eb83ee083e31eb079d84e0fc2c7bbf8 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu/90.0.1… -5a3c063f3caf204c1186b4e6036980e05e6dba3f757e321fafd42166aa870aff | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu2/90.0.… -45bd2ce86fb2e157fbf3385ca0826095d62ffe74f536de71e0ab45d91eb85dfc | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu2/90.0.… -8ded53a279fa40ad084ffcbcb2d735abb71a09ee341ab64bfa7eec9a1245579e | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session-sto… -0dc272d59122f5d97c559c80a3d1dfe45f3ee3180a308800e398900871a225f8 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session-sto… -56ef7634ca1901dcf13f3e166d1702f9f8c0a06060b8d980c46c8f9de2d48553 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session/90.… -4b851c690eff2874d4de297e4919daab0bf6c361d21f14cb7090420a2f0c1f56 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session/90.… -9ba69b141be86fb3dd7c669040cecdecbb3ba69d9fc5e9227803d2e922e973ca | https://maven.mozilla.org/maven2/org/mozilla/components/browser-state/90.0.… -6734252c8918471005096c3e155c78ad17b9d46320273fc564ee6c56ae86baa7 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-state/90.0.… -8c8a40350cb6f22302d30888fc3472c44a5ab32254339ac37b20c477af0028bc | https://maven.mozilla.org/maven2/org/mozilla/components/browser-storage-syn… -f9a3aab99cfddac685ee0b05278498fa6a210b78a511d76ecf6b5c0add96dfc6 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-storage-syn… -695e434563f110e3afe13d12d91c892eb569a4e95a9c1b2bb63d0eb62af98be4 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-tabstray/90… -e4b7aaf18963c3b73384a8940bf160f4f5f5b301f86c67a3ecacdde5a73cdbb2 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-tabstray/90… -be15f1838e28d37d7047edeac7e77da26b627aa34301a213bf7454dda7ec2ce5 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-thumbnails/… -80d0852aed6a561ff985e46f503ea4a48d42041ef71c7e18b14f403ea7e0061f | https://maven.mozilla.org/maven2/org/mozilla/components/browser-thumbnails/… -402e0f2bc4d9edd92dd2c1698c178a1159d739920222a21b7b1372ab93a4acd8 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-toolbar/90.… -54bd6b0b90c2c923305492ae8f52f4274d96d4a75a58a8dd959cd7932557d742 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-toolbar/90.… -7113fbe6f7d25eeeb3429d6894042466887bc47f3e2a7de1e55dcfb43ec36054 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-awesomebar/… -dc05d1d3ae2c7b89148e3454bf9e9bf882a5f19b2f48e3a502f1fdddd2a7d02b | https://maven.mozilla.org/maven2/org/mozilla/components/concept-awesomebar/… -9cd91e9fc6b3dc63601b76d98a81cd621d0befc205bed42b46fc1a2ee2df28e4 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/90.0.1… -9bb2ef61c43db4ae862e0d3d05484d934d23670592a4f73a19e6aec2c71362bd | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/90.0.1… -4075999794ac01e437e7bdf4dcd97f470f072e201d1175eefc99fa8791eeb165 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-engine/90.0… -220553bcd321c0f49b73257517e886381afdd7b81308d14f591267a6b8c77d0b | https://maven.mozilla.org/maven2/org/mozilla/components/concept-engine/90.0… -45ebcc7a4f64c8975a900d341b5217d53614650311ca21a56dca6a7cf666db8b | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/90.0.… -d8d3e6e3fc27839a99eed37be9e31ec9f34c8aceff76d2eecb0d126878b3b0a8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/90.0.… -e0ee69af018d1b09f151ffa7c7537faed49e1bf31289a5a3f4763e7bd2e2eac5 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-menu/90.0.1… -ae4c2da1dd973dc0e2ec426212c87dc14089b711cb2129a9455849a83442c948 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-menu/90.0.1… -5abdb97bb2a93439b0704d314370368f54e7dbfaddf9a14b5f0e1090854e458a | https://maven.mozilla.org/maven2/org/mozilla/components/concept-push/90.0.1… -bfb4bbaf109607911bd0e413ece0318b62ec6198a0b1b780bb8c146df99180d6 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-push/90.0.1… -359f13600bb42484e902555e30c994785472558fbfa7dd84d859f3571ec063ad | https://maven.mozilla.org/maven2/org/mozilla/components/concept-storage/90.… -52459b477cd30995d3bd2dc702f337adc8e8ca4ffdc5a091b4953f94fc96438b | https://maven.mozilla.org/maven2/org/mozilla/components/concept-storage/90.… -2c39cd24ed197364fe1e38281e7fcc475b6c615a7c0dbac34ad81a9fdb970442 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-sync/90.0.1… -94f0d99989afbd20fbe9d717574d15ad9148dd4ad20fbc8fdf9a0cd1871546ce | https://maven.mozilla.org/maven2/org/mozilla/components/concept-sync/90.0.1… -9c3426ce46aa61d2846acf897325470ba9bf1ca537d996b6d9e6a76302657fee | https://maven.mozilla.org/maven2/org/mozilla/components/concept-tabstray/90… -03411a760d3c4eda287b21c28963494d70cfbac636cd1f968ce220bfae102462 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-tabstray/90… -4ece2775025583db3ec2cf762661ce55f24a29ad3bb76d35eb072d94f72269c4 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-toolbar/90.… -ee4491831ed72275b5f34d4f4e1ba1ca9054280ebe186acc3903005682279739 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-toolbar/90.… -7875289df8f717007beb5589882f42ae9a99e227669a5db7c05687696007cf4c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts-pu… -0098c5c21022bd75bded84e6b5c2341d1b4777c9949e3a28a0de564a0f7e4b07 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts-pu… -44252dfc6d5d1adcd6c42ce5bc148164ee4fe8a4636b5ee67d48999908544d33 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts/90… -e36978401448ab34ad1c81dda96e514e0f5a66b2836d5e2427cbaa96fcbad236 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts/90… -cd8ef0f8f4e572ba280ac5dfe9075e510996d8593cd9bdd2b9a2c5872225550e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-addons/90.0… -40dc7f6563e1560d9b9a4bf1713e9c6ce3320505a0c4647baffdec6fda422506 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-addons/90.0… -9e8d40073c8421120449f5a5005603c0de8b77a4cd86a6d2745bfab9ffaea072 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-app-links/9… -828dcaf9d3103a548f7ed88d26d3af05ce76c18f4c9ce6b4096df80ab4d00e6c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-app-links/9… -f393dc1533a0c71d5a7fb4023fa9ae707ff4ddd0c97427dc0fe750aa798ad9b3 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-autofill/90… -962b8e84f3fd2e3440fe4ff4a3216223a602b004478a4dcb622a6a85b82debda | https://maven.mozilla.org/maven2/org/mozilla/components/feature-autofill/90… -07b8aee8271d98e9031820700ffd31f2dc77ef618b4203ecb80aab59df8b78bd | https://maven.mozilla.org/maven2/org/mozilla/components/feature-awesomebar/… -9c5b989d95ad5369155535d5da01173f8d03ae88a8e8af6aba42b575ace2895a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-awesomebar/… -8d2035855ca1d5369f50075330d1aaff9edd3d684a04107b37cd23cc307692f6 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-contextmenu… -5999d2c3926c49c5ed3f91a6b3eda74ac0e448a9641c5ec981d3e730a3eb6d93 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-contextmenu… -392a5cad276918d54ef204ef60504d71814a52aa97445bd7034f83162bdf5ba8 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-customtabs/… -8bb50e18a590c4b20c951c5d633a32a523bb8e912e6d72c157aea2a49aa3d813 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-customtabs/… -2d28c9564ee105466f8daabab8b6e71966873749b48f93af58fa0c358cc5904c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-downloads/9… -5d7c2277076fc071bae3d44159f45d1352cea8d6f3b5c04a7dbaafbf9ae2d392 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-downloads/9… -285b638ad4560089d5b2b782ab5a3a846133546559100e13aaba34c6c56389f8 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-findinpage/… -397b7b33d5a21e87d6e3ccecdfcb9acec9f268a28621a493bf460e7cc31d9cf0 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-findinpage/… -cca96f3583c8d352f2d2bec10be3bc739b45e416016a9626cbd861c7d0bca0d5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-intent/90.0… -324528a0dac1db07440f08687cc10883a4f165e43f63ac3d95d07c05920e8c01 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-intent/90.0… -81e599377b2829996b92fe3dfd0e9efd001dd3382bbb41196d18565b59f303a0 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-logins/90.0… -21973f09526ccfe4da90b54559f93f7f64c0932c958a081928deeaabf072f51a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-logins/90.0… -f6023e7c5105e68f75e3888736a1a1d803e981ec086d431e60191c76ace530f7 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-media/90.0.… -11a00ec87583550928ce32fe2f6944fb723faa4e36a794b156a70a1719ce118f | https://maven.mozilla.org/maven2/org/mozilla/components/feature-media/90.0.… -e109915501d66e0c029c9824865488c5a50c5adb3cd61161b21cc559139dba1c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-privatemode… -bba21bf460b682e57c67a6d6e8db753d0ddeaf4696baa82de679d55582b087a2 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-privatemode… -af4503702eb980c2f893382f3bedcdc7850b086f75d8ef5a3d20cf1366a7570f | https://maven.mozilla.org/maven2/org/mozilla/components/feature-prompts/90.… -9ca2e4e5c758245d35474578fec1549404c8e051e9ddeffc1fc14e7e7a550d0b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-prompts/90.… -0263280ee86a8be16b764649b9d5b942eb2d0d688145c69a23affadf39b1216c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-push/90.0.1… -ece2b01059c3d9cc81bb4b3eda0d1678660ad301e185dbb37eb953d6f8fbf9ce | https://maven.mozilla.org/maven2/org/mozilla/components/feature-push/90.0.1… -629613c3ef5fe47531fa977c00308fcf8891101743eeb9e9bed37e5ec8306101 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-pwa/90.0.11… -216b354a15a4b18734d2209fd1014443440f0898e2439ba0782732f511a51a42 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-pwa/90.0.11… -48f216bb3fd8dc2bd06aaefecdab3f6b53700fcd6d47e50f1505217f1639e441 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-qr/90.0.11/… -5f1452772b53398280f5e39bbf1dd58cbf6568c253bf341a1fb0fe8af41d8c1c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-qr/90.0.11/… -e352c2431cc509cebcde1afaa44d8fa452f8ad564d3bace3a0cdc8d0931299e1 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-readerview/… -4c2eabac2bf18d0faaf8ba71382ef245e78bb797eaead88fcb0b7cfb91ee93f4 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-readerview/… -52f0bb0d3438c0926cd5afb4087936dded7586224b99f1feb216ec854c00f50e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-recentlyclo… -0f45269e90f51a2609e01c5b50dd4b515d4cd14054735362e9d390fd1300fb2e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-recentlyclo… -954150e223aca8c5ffce5a2372cf47bd71dd43381ebd9029bc7333bbdf7ee9f4 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-search/90.0… -6ad00b7d21a5fa8a48dfdbfc4073599cbef4f0a94ab256397b59960f2ec05645 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-search/90.0… -7c8f8936161e570ae82d105f56cc49f36b3b3a3594c0caf8478b969e47f37c4a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-session/90.… -36b09e8884b000a72627c2b77a2f5b33a5206acdaf2086faeb92723e93220993 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-session/90.… -c205072f70ba8e93588aac27126e780d054ea841e0cbba33918090d95748bd31 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-share/90.0.… -4db0e4fa715e804779699687e7f494e64d4b47da613e2b6823cab3e0d540a461 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-share/90.0.… -ba18da4070f9d6e1e8bba6aaeb57c9b74f4dcd7eb04b024fe0220f9ecdef70c7 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-sitepermiss… -71fd9db2d67048a8d2702df9864624fefb6505afa6a79281265b4ae702b2ef6f | https://maven.mozilla.org/maven2/org/mozilla/components/feature-sitepermiss… -d4b56392f428571afc4116fb11ed317303f51015848b744187c8a0b77a3ea968 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-syncedtabs/… -0b4028f5498170623714a5cba9bc89ce1d0155bb0f8250bd559389f570d8b2b7 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-syncedtabs/… -1db6a0831f8caf00f47ffc919ac2beb46da6fbba13e39e9fb87f1ee0c2c902e8 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tab-collect… -c0d7e21469b4cab4524a855e9ee611d3cc2d325e955b5781ae2315452ecbaed3 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tab-collect… -4192a6c00f5213a4a4e74309e994f09ced3ea0c395d2e22e60a561ce305e6377 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tabs/90.0.1… -831364696423963aa4168c62b8e602982bf62ead0ab81a27a117de2b1663de14 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tabs/90.0.1… -09978e4ab04bbdf186b0747c4e14ce64df7540173c14319308bb57f003b81481 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-toolbar/90.… -6bc98d6da80ffb855c216e0db7c97864e99243104dd673aa83020be3297b806c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-toolbar/90.… -07bf24b4865483c89a0ba2d3287c6cca076cb87943bd4047bf40f0f97250d0d5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-top-sites/9… -e1d293d3ef9465ba7f01762d89d866a4b6f2b7de03cfbece0259bd71c45156a6 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-top-sites/9… -9aa7a7d601892e8b928de5f87e6d813d54f5ac15059052db8b6b2082efd888d3 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webauthn/90… -471200411dad8c123dc3f7d5b25c63bae1f3ab7c8f6dcb4e6832e11c27025ea3 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webauthn/90… -0311f925d255b4fdf83f4442321db3d3c8b78c1429208baede114975765a0def | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat-r… -e8835c28e4fc0700f9b03f072023063fa2f9fc0019fd9290f32becdb3eaaa88e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat-r… -0f32439cf379b8022e866de5c3e4c1158f1da69bc26b4336b9ccb474ed518221 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat/9… -eb456ca4724b2ac59637d369a1d8bfabc2767961daf7cef46ee67c5124b5d96a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat/9… -ed2f349413a172894bb243a508f0efa5e67f15b2c754e29ccdc2faba6afa6881 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webnotifica… -b9772a8501f845b77b344d03afda2853384e58d01eee18519e7b836b13bc7cd1 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webnotifica… -f535e1e16c50b85f712dbc09d06d125c330aebabbe8df98cc4788bb4d85255cd | https://maven.mozilla.org/maven2/org/mozilla/components/lib-crash/90.0.11/l… -48975f948791bb3da38d669cc6f5fcf81cff01d458b3d17a9b83b91ee74c4e6c | https://maven.mozilla.org/maven2/org/mozilla/components/lib-crash/90.0.11/l… -ea0870b0930f2fa33b49cb6bd03a2fb0bfb83c5389c6792bc6a1d15915d22d9d | https://maven.mozilla.org/maven2/org/mozilla/components/lib-dataprotect/90.… -f0c4dbd1d70faf5ad632fdc05ed14b5598a6630642822ff5167edeee19614cc9 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-dataprotect/90.… -068d9d3b1e4565c444871d920b5033bd957408a7c5b3ec7db8e051ccd714d46f | https://maven.mozilla.org/maven2/org/mozilla/components/lib-publicsuffixlis… -8768b35bbfe3a7170a49645b58f20daad244b853d9c2b1ed108c5897b8e24e4f | https://maven.mozilla.org/maven2/org/mozilla/components/lib-publicsuffixlis… -55d53cf3950b767813c555d42020f8f2240bcd85e2f0e9adb2bf0ca4325ee4aa | https://maven.mozilla.org/maven2/org/mozilla/components/lib-push-firebase/9… -2fe73bf360b77f167d0bcf58e040db4fb78ab8c80d45f28fe0962e6364068b05 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-push-firebase/9… -694997af9d512ecf4e4afb1c27a24a40332a1a968490dac3e65d54b21e3de077 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-state/90.0.11/l… -c8c8adda3473012aa0c35a15e00d9bb0793e9f0b97d4bbf64d39c8ca6a9ddbb8 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-state/90.0.11/l… -a475a2b2bd4719c1c053541975464932f508c366268de2cf0eb2007711139c83 | https://maven.mozilla.org/maven2/org/mozilla/components/service-digitalasse… -cc22ef6f20c3814bf5a8d089522c66b7a73ef400914206c05c9f0e1bd34c7eee | https://maven.mozilla.org/maven2/org/mozilla/components/service-digitalasse… -5263cdd863798f88c735e9fbdf7ab7b4748ed8be18312d56696f17eb04f9e508 | https://maven.mozilla.org/maven2/org/mozilla/components/service-firefox-acc… -7cf4f74bbe1a8773764ab1e6b1c0b07b5ed9c161624d338ad5c0cd7e5e9de6b4 | https://maven.mozilla.org/maven2/org/mozilla/components/service-firefox-acc… -27f65de8120b6c2cd13947f2114565317c4683f6ce022a8ef60855ca7c89690e | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/90.0.… -88e328ee1ac9a6a2a1c8125b2c73455d9fd6e5b11cf784f46100eb38817991b4 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/90.0.… -d2075724ba5d96228471133ff992050a5d4401cad467c4df28e104447ae149f9 | https://maven.mozilla.org/maven2/org/mozilla/components/service-location/90… -aaf9723907b33263ca76b06f6b8c7006c1098c570a4ad9d82d35430ce0c79a39 | https://maven.mozilla.org/maven2/org/mozilla/components/service-location/90… -ba20047e1ab405b842a4977bf122261eb43735aad93d921a54e0169c7e467f3d | https://maven.mozilla.org/maven2/org/mozilla/components/service-nimbus/90.0… -c00109cad54b97815de0ce49d81a565365d695841edfafc972c765af981d4fce | https://maven.mozilla.org/maven2/org/mozilla/components/service-nimbus/90.0… -e09368d2c171f25286f796ea3b5415df1dfd5db2744e879433fb1ecf0b7dcdd9 | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-autofi… -fabedd1e11f563d76523713b0e2b37388e360f74e6806aa166915f64ed9fdb53 | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-autofi… -98d134df12d9d6226462a336794ca225def776f8afcafad8ea76a3f7a25b4cdf | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-logins… -f9c50b0f34f701891130efdd079e6691c5991f0e48d4e60b24d9c40a0417314d | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-logins… -4b1d44222e1e36cef4de9b72e980a2963a0fce5c0904153fa1b5e8e0f61ccfe7 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/90.0.1… -1c06fec562cb55735bfb09f83d2530dda858ea8ed5de9673b395291db7756381 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/90.0.1… -ceb7b1ef70b30d4828300a0a59342bf7d8dc9526fd0d9bcebc69977b38116dac | https://maven.mozilla.org/maven2/org/mozilla/components/support-images/90.0… -8eb0fe48dc9b4924b5a523f23153277d6f7d8227f040fa77682b71ec7962cd67 | https://maven.mozilla.org/maven2/org/mozilla/components/support-images/90.0… -312bea3da7fd943ca38b5174a1a07af876f13342b25b88bf27e8bb915eb553b4 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/90.0.11… -fe68148cbd4a4991fe16e934b84ff63d6a84c5efbee81f4d6e83bd48aa1f5a8c | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/90.0.11… -c6cd2750561aee198c3e9e8907c187e4595d8fe861d380ee608e257948e6c144 | https://maven.mozilla.org/maven2/org/mozilla/components/support-locale/90.0… -402635ea6d787d813ac398564e0c4ae6ed70986dc42fb0e8032b526c0941199f | https://maven.mozilla.org/maven2/org/mozilla/components/support-locale/90.0… -b36ea1ff20d9420b4b280ef28b1756fd7272148eb84c63c3bf972e7cf1dbdaea | https://maven.mozilla.org/maven2/org/mozilla/components/support-migration/9… -65228ebf6b58dfbce4a9b8a255d98ce61e820625cf6deca23779a9450fbb22b9 | https://maven.mozilla.org/maven2/org/mozilla/components/support-migration/9… -c9a04732c9a7e37f61284b5e5a917a33db63ad97fc8fc01a2d85abbf65a88a95 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rusthttp/90… -b2b24abba66ab356d42b11bae35c6f662e9e74c46a18f5daa12fee9b888e0fec | https://maven.mozilla.org/maven2/org/mozilla/components/support-rusthttp/90… -fb718c510fe5403549fe98f698d1fc6aefc652934d0e691a03e3b76d5c9e9711 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rustlog/90.… -04782b18806a27921104aaca4e40b8166e5f84d30a6fcb28ce2db1b0c7862934 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rustlog/90.… -7e073c88ab67b4bc55e91056b3881760c4e17ee30202e40fa57fd4e77910078e | https://maven.mozilla.org/maven2/org/mozilla/components/support-sync-teleme… -0c9baffa43c3805fd1c166dffb938dc6d554f104d2974798fb9e5bd5d8074a16 | https://maven.mozilla.org/maven2/org/mozilla/components/support-sync-teleme… -51061a509a56cab420c66ba44f927b3fdc3aac3d1d6f50e91fd607139e407a56 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test-libsta… -ca7b81f07e580e6be64b6d1cbe1875ee6d6c7928e6b493df4d9a09c60c6e3008 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test-libsta… -027b737998baf285d61a31c1a8e1b0bec207c54f3fdbeb29324d0a7b6bc70d19 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test/90.0.1… -77ef42ad9b8908019e93016fcbcf0121ec3c21dc458edeb9e71b4d718bc922ee | https://maven.mozilla.org/maven2/org/mozilla/components/support-test/90.0.1… -756d0c5a4129b231640cfaf7ae4027afffd6bfa88dad95b42f4f86e68d3a4ce7 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/90.0.… -9b70e4ca62febacd4a74b01fd03e184bfb966cbf2f02ff096e55331ab217794b | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/90.0.… -f4f01e6b4cd68252b60c17c1dfe33a97ddc8af2e30ac236f739b3453dc2561c5 | https://maven.mozilla.org/maven2/org/mozilla/components/support-webextensio… -cab2544186dd516fe66c2a3454dfc4a38f45ba39b87a96f20f9b7a50eb32a2e2 | https://maven.mozilla.org/maven2/org/mozilla/components/support-webextensio… -9619d9b667eaa722076224b20f14d26e4c53dce0f64d10aae3d00105da343c42 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl… -d1f7143db695c39b08a8060e1dec2707e824b97850da0df3cb212b5121fdb0be | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl… -c39f637135297c39a4ea6dcd36e9e12654ec1cdc4566df78af40307da12d67aa | https://maven.mozilla.org/maven2/org/mozilla/components/ui-autocomplete/90.… -d6f62980338b818c3c2d433e9983005a0f16ca0b8f0a7b6dd46ecb66f612dcd2 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-autocomplete/90.… -1bfa42c11b74627e77914af4d3344db3f8fe307790f8c1b1c1164bdca83b7e20 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-colors/90.0.11/u… -2a7999fc95d103a5fe4a85686058982dfa47f5983270ab2894e88b2359526bb6 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-colors/90.0.11/u… -28465b517872cb0d28c841abd69abc1276e09dbf9225f508889b6856e9b1e9b8 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-icons/90.0.11/ui… -def7febf1bd7f23296b73eaa6c6f82f332ffd51e471a09858dfff98bb53ae654 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-icons/90.0.11/ui… -0266b5014d54fc2f2effcf2ef23952fbded79d315bbbc9874145a71b211782ec | https://maven.mozilla.org/maven2/org/mozilla/components/ui-tabcounter/90.0.… -5a01c0f14c1153b7bc72a399dac620df17cb0f6b8eb71eee7085cbc4e8afbc2c | https://maven.mozilla.org/maven2/org/mozilla/components/ui-tabcounter/90.0.… -b853d7eb1710c7b042ec4ae17aeb76dcb812fd7a0d7db1b14dda12c328e6186a | https://maven.mozilla.org/maven2/org/mozilla/components/ui-widgets/90.0.11/… -222e1505a69fdcbc022cd7b833b4eaef8ce15de90db4e7fe109c745c91f9c6eb | https://maven.mozilla.org/maven2/org/mozilla/components/ui-widgets/90.0.11/… -4bac410c8dbd792933a1e03e980a67fb41a5f0ec164836eb2c5e47e9a8157f8f | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/90.0.… -192631dbca16d4cb03f4f8b4913f79e4ec2fe01877c03a4e0c7b485346f0a26f | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/90.0.… +9c5694be50d20bf7c1dcb29eaf148ed672f9d362bd72f2b158ecbf1a02691316 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-awesomebar/… +64758ccf4bbbb3d85b6fb08670aecba5dc268a4da0447bd104e1fff8e5ea22db | https://maven.mozilla.org/maven2/org/mozilla/components/browser-awesomebar/… +c404ac90f6d24d17099ed1bbee57057f11ddf012356da0132901c2fd56c4a48d | https://maven.mozilla.org/maven2/org/mozilla/components/browser-domains/90.… +d4c1f25639a8e1654fe73ade3b9e21e21255051b9401cbd3b643526e02d9d6d2 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-domains/90.… +dc2097e0c65d8abb91d6019da2ed48dd18c1e5031a0342202c2acfb50775abee | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… +08e10dfb690f8366527ae9a4de7f78a884bad1482c3e734d9b11330ac274a1de | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck… +73e9303f49abd4cf9f1be79d87afc4f4466eb78fea746ede959a789c1e92cc2b | https://maven.mozilla.org/maven2/org/mozilla/components/browser-errorpages/… +adca44d699aa2e1001bb440570981d338810eb279c0bbe51794abb82854d6b63 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-errorpages/… +308b3ba33e7df3883ba2aacbf55897c9a867e06e1c93f44698fdd1c280ad7ed8 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-icons/90.0.… +b0e96fee3957500895c14d050586d111ab5df757866661216bece1c2479c931c | https://maven.mozilla.org/maven2/org/mozilla/components/browser-icons/90.0.… +0513f2ecbbfdbe55f65f997b07ac90c95e0678fd9622c8ea33ed7b92cdc3920e | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu/90.0.1… +c8cc40da0f9f8e36ceba262c95184f48d7cb7a0fd7f025d77eea56eefaf0275c | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu/90.0.1… +5a3c063f3caf204c1186b4e6036980e05e6dba3f757e321fafd42166aa870aff | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu2/90.0.… +1ad5adc5ea691cb1436613c3d71a555d8acc38dc1cf4a567dd740ee534b716a3 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu2/90.0.… +8ded53a279fa40ad084ffcbcb2d735abb71a09ee341ab64bfa7eec9a1245579e | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session-sto… +c6c8ac7ab985b4ba1a4592ff75a678c9081f9156dbc29b6e983de4708ab66134 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session-sto… +56ef7634ca1901dcf13f3e166d1702f9f8c0a06060b8d980c46c8f9de2d48553 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session/90.… +771ef748004d51bc8aa356c368e16ef1a4720fd001215fac9a51f8ac719e2922 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session/90.… +9ba69b141be86fb3dd7c669040cecdecbb3ba69d9fc5e9227803d2e922e973ca | https://maven.mozilla.org/maven2/org/mozilla/components/browser-state/90.0.… +fa0f35011dbb0374a8abd2a61af2372e5f29dca5bc3b1a5166e08e6f3f840035 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-state/90.0.… +8c8a40350cb6f22302d30888fc3472c44a5ab32254339ac37b20c477af0028bc | https://maven.mozilla.org/maven2/org/mozilla/components/browser-storage-syn… +576ffafbf54c07132862d085d1428ce07331044effc350ea7e4c3733fd7fb2d2 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-storage-syn… +695e434563f110e3afe13d12d91c892eb569a4e95a9c1b2bb63d0eb62af98be4 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-tabstray/90… +0013838c7ee43340280515e3048fc60345f1159ea8922399d676ba9e14c6a8ab | https://maven.mozilla.org/maven2/org/mozilla/components/browser-tabstray/90… +be15f1838e28d37d7047edeac7e77da26b627aa34301a213bf7454dda7ec2ce5 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-thumbnails/… +a4b4d57f44faea323fe57da68fce6e9cd6628b2e741dfacf5baa2f5c5761b0fe | https://maven.mozilla.org/maven2/org/mozilla/components/browser-thumbnails/… +402e0f2bc4d9edd92dd2c1698c178a1159d739920222a21b7b1372ab93a4acd8 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-toolbar/90.… +e682e2be9d265a99b0f849493d25fd5fa83302bad856eef7f707076433b9aa80 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-toolbar/90.… +7113fbe6f7d25eeeb3429d6894042466887bc47f3e2a7de1e55dcfb43ec36054 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-awesomebar/… +46be4e00d4d59c171f891bdffd2c36cc76c9c1315985beeeff395d4380f758df | https://maven.mozilla.org/maven2/org/mozilla/components/concept-awesomebar/… +bbaf1e1ccceb1115202b1cb6275da1765289b6067db9d390207db7dcea5dd1a8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/90.0.1… +be243169acd63e7cecd45ec8dc0200ad6133a89cf46d59b69a8df7865178ba31 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/90.0.1… +4075999794ac01e437e7bdf4dcd97f470f072e201d1175eefc99fa8791eeb165 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-engine/90.0… +0542d2f8bd9520e11180eda8ca679ea808aa8a3ce735f79f1e2a5ba2a07ba40d | https://maven.mozilla.org/maven2/org/mozilla/components/concept-engine/90.0… +2044bff8c23e93a58470cb2eb475300ca3314e890121aa1be735fefe7022f179 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/90.0.… +d82a96fbf5e66346333409c929211183522f6887dfefc2555995d852d47110ba | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/90.0.… +e0ee69af018d1b09f151ffa7c7537faed49e1bf31289a5a3f4763e7bd2e2eac5 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-menu/90.0.1… +404bfa0ffa74f897ca8ee6f9a7e117f31e4808e6ea0c1766d15e3356b8847137 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-menu/90.0.1… +5abdb97bb2a93439b0704d314370368f54e7dbfaddf9a14b5f0e1090854e458a | https://maven.mozilla.org/maven2/org/mozilla/components/concept-push/90.0.1… +06f89b0217f5099567500aeaa5282cf9f9059219be4b7b164e33c34795caf306 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-push/90.0.1… +359f13600bb42484e902555e30c994785472558fbfa7dd84d859f3571ec063ad | https://maven.mozilla.org/maven2/org/mozilla/components/concept-storage/90.… +a654ce445760858798a23daabf681e0643a2bff29e4cc3c9fadda55a0eb4fb6c | https://maven.mozilla.org/maven2/org/mozilla/components/concept-storage/90.… +2c39cd24ed197364fe1e38281e7fcc475b6c615a7c0dbac34ad81a9fdb970442 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-sync/90.0.1… +19fb3a1bd6aa09ec367113e794e5559c3de4757949f547754e7a3c8186381b18 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-sync/90.0.1… +9c3426ce46aa61d2846acf897325470ba9bf1ca537d996b6d9e6a76302657fee | https://maven.mozilla.org/maven2/org/mozilla/components/concept-tabstray/90… +2c9fdd36d4a03e4d0320f4cdc83bc760a2f818a1513343032cd530a29a2f8fd1 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-tabstray/90… +4ece2775025583db3ec2cf762661ce55f24a29ad3bb76d35eb072d94f72269c4 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-toolbar/90.… +40414cd542a96c96833cb32e0c780ea640fb928627f1ddf1423d4f0c4640b456 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-toolbar/90.… +7875289df8f717007beb5589882f42ae9a99e227669a5db7c05687696007cf4c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts-pu… +c98d338dd373e547bda508105013a2f7a21bb3b4326020aaaa579725e1cccde4 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts-pu… +979409be707c08ce03ed7afec3817ef8bf47e8343d647d30ea655aa6e7f69f85 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts/90… +a838ac2655f0c03bf2dc5a22ad9a20a7667a7bc78d4325846921556adef6413b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts/90… +c57a84e582a7a800bb39d20869dd91d2636d8757842b53895c1f3fa60a2798ca | https://maven.mozilla.org/maven2/org/mozilla/components/feature-addons/90.0… +6eb6cd1eb89a450e1d0fe48a8dc823aad8ebb74f77d0c0a87cfe37085734405c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-addons/90.0… +9e8d40073c8421120449f5a5005603c0de8b77a4cd86a6d2745bfab9ffaea072 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-app-links/9… +6a4002ab585aef5540b15746f77e8884ed3dbfb449f784e00173aaa6b3ba3bf9 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-app-links/9… +7f6b71405eed034fa60de5058da62e0e7a1e3a4eebf1b789397974683483f8f7 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-autofill/90… +408f79f7799d50f8a45ce73114a991ddb63968e77414fba371bf0504284933d7 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-autofill/90… +07b8aee8271d98e9031820700ffd31f2dc77ef618b4203ecb80aab59df8b78bd | https://maven.mozilla.org/maven2/org/mozilla/components/feature-awesomebar/… +292fd673966119aea9757721f3b19a2cdfa40ae4d740944807da274d30081fd3 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-awesomebar/… +245cd071717df71f33fb5dfc538c59905da7286df53bb856d6f873c668119cd4 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-contextmenu… +3e386ef47a3f4b6e8cdf2bfbadd35615d46bfb9ef343ad61e009a982952a128c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-contextmenu… +392a5cad276918d54ef204ef60504d71814a52aa97445bd7034f83162bdf5ba8 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-customtabs/… +ed0e9c88d18c325aabf1323a0a1ce77b90e4247998e314151bc70798df807aa5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-customtabs/… +27877e30862a10351551faa9adf472ae5e5b7ec2e8b01009042cf24f5c7d5a58 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-downloads/9… +37248d487d7666abd645c025c23d6426d88cd6dae34b2a2b2c8830f990b847cf | https://maven.mozilla.org/maven2/org/mozilla/components/feature-downloads/9… +285b638ad4560089d5b2b782ab5a3a846133546559100e13aaba34c6c56389f8 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-findinpage/… +161d679ac74d29c3030d0898aab5029896f3e5833ea024a9d848be0bd994589f | https://maven.mozilla.org/maven2/org/mozilla/components/feature-findinpage/… +cca96f3583c8d352f2d2bec10be3bc739b45e416016a9626cbd861c7d0bca0d5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-intent/90.0… +9915be7b0231ca0c56a706b5a616726978c3205c508a08a477ec12d91a16829c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-intent/90.0… +81e599377b2829996b92fe3dfd0e9efd001dd3382bbb41196d18565b59f303a0 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-logins/90.0… +b6bb497263ae3dc874a69bfd0d1cc25db82d6871056528f89b67b0db2fe7e044 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-logins/90.0… +f6023e7c5105e68f75e3888736a1a1d803e981ec086d431e60191c76ace530f7 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-media/90.0.… +c752612ef9276dbd39e9312280694d7fa337aad3294e3e048f483d033e1846cb | https://maven.mozilla.org/maven2/org/mozilla/components/feature-media/90.0.… +e109915501d66e0c029c9824865488c5a50c5adb3cd61161b21cc559139dba1c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-privatemode… +26d2ecc4faef48fc9f7f1eb4dfe696680c487e78fd659e3ceaaab799b99ff7cd | https://maven.mozilla.org/maven2/org/mozilla/components/feature-privatemode… +741e57f32b40cc25de1c020ed078a30313f6cfb7f8b094cc8dc6446a9e5d19ab | https://maven.mozilla.org/maven2/org/mozilla/components/feature-prompts/90.… +b8bd7583dd4143d23a361c3a85f41447bea996776cbfaf6710426c2eff94a3ee | https://maven.mozilla.org/maven2/org/mozilla/components/feature-prompts/90.… +0263280ee86a8be16b764649b9d5b942eb2d0d688145c69a23affadf39b1216c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-push/90.0.1… +19f8bedcec03bc4a88d95cdd45fdf492a9935c3e578c9d9d076821d2cd74be41 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-push/90.0.1… +629613c3ef5fe47531fa977c00308fcf8891101743eeb9e9bed37e5ec8306101 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-pwa/90.0.12… +8e0cd9972f3b6a2c3deadd06b4a5197005872466009b7ff88a412338a0edffe5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-pwa/90.0.12… +48f216bb3fd8dc2bd06aaefecdab3f6b53700fcd6d47e50f1505217f1639e441 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-qr/90.0.12/… +947f3f12b2ae08c93c8a62110a56e55ed7a10373827ded277f8c80193399f460 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-qr/90.0.12/… +c79731b9c166c48d6301ad7d976e69617219af5ff82a345bdfb02edd1be47adb | https://maven.mozilla.org/maven2/org/mozilla/components/feature-readerview/… +4eca341ba4c78e981c8178bee0e3dbc9ebacfc75e813ca03d62ee8ec0447344e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-readerview/… +52f0bb0d3438c0926cd5afb4087936dded7586224b99f1feb216ec854c00f50e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-recentlyclo… +f9a6c96e4eff5b260c92f621253e37d1eeb5527f3b9ce6b01f1236dc7cc4efc2 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-recentlyclo… +954150e223aca8c5ffce5a2372cf47bd71dd43381ebd9029bc7333bbdf7ee9f4 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-search/90.0… +129ef699aa65684a724f5689f7f1bb4cc39c2d7f1d28ba53915cc064bbbebd8e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-search/90.0… +7c8f8936161e570ae82d105f56cc49f36b3b3a3594c0caf8478b969e47f37c4a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-session/90.… +ec1098996b8bfca986b0c7e572c84bd64b081d0f53717b7806c6ba1ca6bac29b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-session/90.… +c205072f70ba8e93588aac27126e780d054ea841e0cbba33918090d95748bd31 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-share/90.0.… +697aa9ef2180c895515ea3e420fd586383491f70364a180201476570709dba40 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-share/90.0.… +ba18da4070f9d6e1e8bba6aaeb57c9b74f4dcd7eb04b024fe0220f9ecdef70c7 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-sitepermiss… +5413a31f873fdf0ac3485b1a8b3af244a46af5bb364db2d2a49b4dcd421e6199 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-sitepermiss… +d4b56392f428571afc4116fb11ed317303f51015848b744187c8a0b77a3ea968 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-syncedtabs/… +68c438bc59668e845a045592e3bbbbec74276e1c5f3b985fb2cf7b0c2f8573e8 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-syncedtabs/… +1db6a0831f8caf00f47ffc919ac2beb46da6fbba13e39e9fb87f1ee0c2c902e8 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tab-collect… +9d4e7876af9a45b4f8f24aaa86e29789390e50eafa66172277439a1ae899c508 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tab-collect… +9ae189015e453b95d3fbf5472621db87e0ff8d4873eafc5a751a63bcda236cf1 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tabs/90.0.1… +d1f2a8794cd20aa870938958fc7e8347001572d4609e9e89b44025304ff1eec1 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tabs/90.0.1… +09978e4ab04bbdf186b0747c4e14ce64df7540173c14319308bb57f003b81481 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-toolbar/90.… +fb8310d14852587bc9ff48b889ace8a1aa47362ef79ce526f83d4b8a9ad9c48e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-toolbar/90.… +07bf24b4865483c89a0ba2d3287c6cca076cb87943bd4047bf40f0f97250d0d5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-top-sites/9… +e73e09b714950c74af264accff9297fde1323c95d8f5ef939a455cf598034839 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-top-sites/9… +9aa7a7d601892e8b928de5f87e6d813d54f5ac15059052db8b6b2082efd888d3 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webauthn/90… +250047470b69f8d07858b6aa24c6f62abc0e3dfda2833191b798e2cf52d0ec75 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webauthn/90… +0311f925d255b4fdf83f4442321db3d3c8b78c1429208baede114975765a0def | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat-r… +ee29403ebcc08fc275fa6261be8cbbf4fea1da4f34b2cc34d74cfd2bbcd873c2 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat-r… +0f32439cf379b8022e866de5c3e4c1158f1da69bc26b4336b9ccb474ed518221 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat/9… +3353497ac0d579991be25321f7a25705982331f0c62de1f1957f2e7e47c465d3 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat/9… +ed2f349413a172894bb243a508f0efa5e67f15b2c754e29ccdc2faba6afa6881 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webnotifica… +12bdcf092142cce7894508c1b33f21983e9d686c2aefc9831bf9ecf74c9184eb | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webnotifica… +addb38dee2f29d8c9be92b989ad4ce7ff3f019495ceca382257fc735e73b4d45 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-crash/90.0.12/l… +9c476961192907c7ff168df8c70a81ab9dde61355d60d96d95994f80606dcd5b | https://maven.mozilla.org/maven2/org/mozilla/components/lib-crash/90.0.12/l… +ea0870b0930f2fa33b49cb6bd03a2fb0bfb83c5389c6792bc6a1d15915d22d9d | https://maven.mozilla.org/maven2/org/mozilla/components/lib-dataprotect/90.… +b05fbe0aebdd7962ef0f6a4ac0ca39966626df98ac8dd34670f925f47e63494d | https://maven.mozilla.org/maven2/org/mozilla/components/lib-dataprotect/90.… +068d9d3b1e4565c444871d920b5033bd957408a7c5b3ec7db8e051ccd714d46f | https://maven.mozilla.org/maven2/org/mozilla/components/lib-publicsuffixlis… +e81999354ed65f0d2b7069c903e1a26c7ee5b5f4638526a994267ed1f2d8ff56 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-publicsuffixlis… +55d53cf3950b767813c555d42020f8f2240bcd85e2f0e9adb2bf0ca4325ee4aa | https://maven.mozilla.org/maven2/org/mozilla/components/lib-push-firebase/9… +6480b3e75fbf7e25eb6149ae56b734b35114a76fb67b93bbd13edb1e87b72dd0 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-push-firebase/9… +694997af9d512ecf4e4afb1c27a24a40332a1a968490dac3e65d54b21e3de077 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-state/90.0.12/l… +c55c965bc433fa58b712ca044b84d060d862f4c56611ea992cd28f6ede0f0808 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-state/90.0.12/l… +a475a2b2bd4719c1c053541975464932f508c366268de2cf0eb2007711139c83 | https://maven.mozilla.org/maven2/org/mozilla/components/service-digitalasse… +fee496f17920ef88e33c42d17063fbd53a8ce4f600382a6b73c06bd7c08a7d73 | https://maven.mozilla.org/maven2/org/mozilla/components/service-digitalasse… +5263cdd863798f88c735e9fbdf7ab7b4748ed8be18312d56696f17eb04f9e508 | https://maven.mozilla.org/maven2/org/mozilla/components/service-firefox-acc… +2cb6b4249d962d955cf6b513fc5144a9bdfc57ec9c808905329a12d1a3f11ebf | https://maven.mozilla.org/maven2/org/mozilla/components/service-firefox-acc… +27f65de8120b6c2cd13947f2114565317c4683f6ce022a8ef60855ca7c89690e | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/90.0.… +8ca3f8676d7c7cc04a34395a317ef9d0b6858ea522cc853cf96fe93c0be17ea7 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/90.0.… +e78d5d7ee7cf2ab96aeb6c2bf0aa7d680e535b4ba7f1baa6b921235a5ed5ec8a | https://maven.mozilla.org/maven2/org/mozilla/components/service-location/90… +e51865d21bdf496b0e3283cde78b6ba9f64383c2ba23280e18422d6bee1f38c5 | https://maven.mozilla.org/maven2/org/mozilla/components/service-location/90… +3532d05ccc874507ab2a1a667ce1e8b7fd38e615ca78014c5601ed7bf63d379a | https://maven.mozilla.org/maven2/org/mozilla/components/service-nimbus/90.0… +633f6ef4d8f1e91c34e6c529b00dd6fbfe70624cf8b4d77e003baf12b3e3a3c3 | https://maven.mozilla.org/maven2/org/mozilla/components/service-nimbus/90.0… +e09368d2c171f25286f796ea3b5415df1dfd5db2744e879433fb1ecf0b7dcdd9 | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-autofi… +b1acadb2a1e9faba878b28a9365bf53fa8e403a518b1982209adcdb92dc6b0fc | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-autofi… +98d134df12d9d6226462a336794ca225def776f8afcafad8ea76a3f7a25b4cdf | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-logins… +ada4da3a96ba4069a6c05bc5e29527eb338df86a7a77fe50b40a7e6aa1a8574a | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-logins… +382053c52fa6be16c0eb61ed1e9feacab9abba7c72bf36ed6ecbfa1c0bb6bec4 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/90.0.1… +20e1ccdf36a87c0218265bdc64fabb8f528332ccc33dcac6779252b6713ad3be | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/90.0.1… +ceb7b1ef70b30d4828300a0a59342bf7d8dc9526fd0d9bcebc69977b38116dac | https://maven.mozilla.org/maven2/org/mozilla/components/support-images/90.0… +d11f4f3c4fc610df4eacad8e0ebba123fbc5e323299c01f7dbfcddd714495fa1 | https://maven.mozilla.org/maven2/org/mozilla/components/support-images/90.0… +312bea3da7fd943ca38b5174a1a07af876f13342b25b88bf27e8bb915eb553b4 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/90.0.12… +830a56102f0556d05f8b2206b2d82c3ab3f310050ad03dd30c285ad8b87ff5a1 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/90.0.12… +c6cd2750561aee198c3e9e8907c187e4595d8fe861d380ee608e257948e6c144 | https://maven.mozilla.org/maven2/org/mozilla/components/support-locale/90.0… +977a2c883c76d30ff93204dc55511e65f1190800a70a1e4003140d563810e8ab | https://maven.mozilla.org/maven2/org/mozilla/components/support-locale/90.0… +b36ea1ff20d9420b4b280ef28b1756fd7272148eb84c63c3bf972e7cf1dbdaea | https://maven.mozilla.org/maven2/org/mozilla/components/support-migration/9… +3108ec05881d3345b6fb84420051fd5292efe8ac5d582d902244cb0fbf379d4e | https://maven.mozilla.org/maven2/org/mozilla/components/support-migration/9… +c9a04732c9a7e37f61284b5e5a917a33db63ad97fc8fc01a2d85abbf65a88a95 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rusthttp/90… +020c4e26649a494b93675df2596ff68a9a884287093e1ac83c7045a6d65806b9 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rusthttp/90… +fb718c510fe5403549fe98f698d1fc6aefc652934d0e691a03e3b76d5c9e9711 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rustlog/90.… +c98f9feffd8e2578fe315c42b3f0f50891298b87674c5d421a8c85965e7406f9 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rustlog/90.… +7e073c88ab67b4bc55e91056b3881760c4e17ee30202e40fa57fd4e77910078e | https://maven.mozilla.org/maven2/org/mozilla/components/support-sync-teleme… +7714939de52aee7136194b5ac6dd5edeef16841b5b61ed67619125db22f3dc69 | https://maven.mozilla.org/maven2/org/mozilla/components/support-sync-teleme… +51061a509a56cab420c66ba44f927b3fdc3aac3d1d6f50e91fd607139e407a56 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test-libsta… +d23b6972ce76fe5b373458dfa4a9e7d0024986526acbf7341ff19fc847bc435b | https://maven.mozilla.org/maven2/org/mozilla/components/support-test-libsta… +027b737998baf285d61a31c1a8e1b0bec207c54f3fdbeb29324d0a7b6bc70d19 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test/90.0.1… +ba5bb89df94ef9c4d5f79a090db42364a8d71d592c5361e92b40d950098deb38 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test/90.0.1… +756d0c5a4129b231640cfaf7ae4027afffd6bfa88dad95b42f4f86e68d3a4ce7 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/90.0.… +d2a058c1bfa6804b0a8557b54afe0143ff0529be7a02e1e9dfb9ce269c50ea7a | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/90.0.… +f4f01e6b4cd68252b60c17c1dfe33a97ddc8af2e30ac236f739b3453dc2561c5 | https://maven.mozilla.org/maven2/org/mozilla/components/support-webextensio… +1b53d85a5a50ac6bd674539f08cea9e25d9baca42680661707e73ef066b10862 | https://maven.mozilla.org/maven2/org/mozilla/components/support-webextensio… +8ed9188bbc59eb75457deac094ab42cb058d37b54c8727d7ab924dae1807a0e6 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl… +4315b1f2932d0ad520d3eba0235132c0054b11ec24190cbe686e7a1a6af8cb6f | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl… +c39f637135297c39a4ea6dcd36e9e12654ec1cdc4566df78af40307da12d67aa | https://maven.mozilla.org/maven2/org/mozilla/components/ui-autocomplete/90.… +d3b58696b898860270d35199c5e83187874fc0465091bae3aa4ea9738a35fb9b | https://maven.mozilla.org/maven2/org/mozilla/components/ui-autocomplete/90.… +1bfa42c11b74627e77914af4d3344db3f8fe307790f8c1b1c1164bdca83b7e20 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-colors/90.0.12/u… +46e947d01b9b3fbca9214cdea162a607e0e966a2dc655ceddfe964b69f80dadf | https://maven.mozilla.org/maven2/org/mozilla/components/ui-colors/90.0.12/u… +28465b517872cb0d28c841abd69abc1276e09dbf9225f508889b6856e9b1e9b8 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-icons/90.0.12/ui… +b3e62dea5413d440ddceb9ff64f4dffa2d6110271cf00c5713d1ca031a8353e5 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-icons/90.0.12/ui… +e87f83dae66dd426531b612b2658b5748326b9e46f55b7f3d492422e5c02c941 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-tabcounter/90.0.… +4428344060392a6601c2e136c6f4be18eefba17b0c22e104bd22631de1e2837f | https://maven.mozilla.org/maven2/org/mozilla/components/ui-tabcounter/90.0.… +b853d7eb1710c7b042ec4ae17aeb76dcb812fd7a0d7db1b14dda12c328e6186a | https://maven.mozilla.org/maven2/org/mozilla/components/ui-widgets/90.0.12/… +ed166ade7d06412f7b88d3dc0612d7f43598240a87eed331e407e84503e0a9ee | https://maven.mozilla.org/maven2/org/mozilla/components/ui-widgets/90.0.12/… +6918bb8864d4e066412edaf0f4771fdd4309a4197436d59735e6956efed4c766 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/90.0.20210… +c5de862f7feca6dc70dad5120ba780e85ff53203939338845d53dffac157f2f0 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/90.0.20210… 8f8856f00b005a719e75759a2cdcf6cd8ef30b9a65ade3086f713644e7acabbf | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… 7016d5e5b17bf8c778d15e77dc0e543e2fff2d97675053b03e01219ebf6c70b7 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3… c1316aeabddcde013f52f0a49fc147becfe10621fefb6afe09fd814886c7ecf5 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/… diff --git a/projects/geckoview/config b/projects/geckoview/config index f3abddb..6ed2e1a 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - geckoview_version: 90.0b12 + geckoview_version: 90.0 torbrowser_branch: 10.5 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 2520833..f51b13c 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2021.4.15 +version: 2021.7.13 git_url: https://github.com/EFForg/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 d96a6a2..5eca79f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,16 @@ +Tor Browser 10.5.3 -- July 17 2021 + * Android + * Update HTTPS Everywhere to 2021.7.13 + * Update Fenix to 90.1.1 + * Bug 40172: Find the Quit button [fenix] + * Bug 40173: Rebase fenix patches to fenix v90.0.0-beta.6 [fenix] + * Bug 40177: Hide Tor icons in settings [fenix] + * Bug 40179: Show Snowflake bridge option on Release [fenix] + * Bug 40180: Rebase fenix patches to fenix v90.1.1 [fenix] + * Build System + * Android + * Bug 40312: Update components for mozilla90 [tor-browser-build] + Tor Browser 10.5.2 -- July 13 2021 * Windows + OS X + Linux * Update Firefox to 78.12.0esr diff --git a/projects/tor-browser/allowed_addons.json b/projects/tor-browser/allowed_addons.json index 4556886..00a8a07 100644 --- a/projects/tor-browser/allowed_addons.json +++ b/projects/tor-browser/allowed_addons.json @@ -17,7 +17,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/13/13299/13299734.png?mo…" } ], - "average_daily_users": 626914, + "average_daily_users": 613905, "categories": { "android": [ "experimental", @@ -31,7 +31,7 @@ "contributions_url": "https://opencollective.com/darkreader?utm_content=product-page-contribute&u…", "created": "2017-09-19T07:03:00Z", "current_version": { - "id": 5239111, + "id": 5262581, "compatibility": { "firefox": { "min": "54.0", @@ -42,19 +42,19 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/52391…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/52625…", "files": [ { - "id": 3783471, - "created": "2021-05-28T13:29:07Z", - "hash": "sha256:49e7ec13cfdb953dfb785a2442582788e895a5623956d0b7dff02f59db2e3159", + "id": 3806938, + "created": "2021-07-07T11:58:46Z", + "hash": "sha256:9ba482118d25675af31ee403c740972a106fdccfd117c4449c046b70f1a2d95d", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 541560, + "size": 541270, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/3783471/dark_reader-4.9.3…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3806938/dark_reader-4.9.3…", "permissions": [ "storage", "tabs", @@ -97,10 +97,10 @@ "url": "http://www.opensource.org/licenses/mit-license.php" }, "release_notes": { - "en-US": "- Fixed disability to switch on sites in Global Dark List.\n- Bug fixes.\n- Users' fixes for websites." + "en-US": "- Dynamic mode bug fixes and performance improvements.\n- Minor UI improvements.\n- Users' fixes for websites." }, "reviewed": null, - "version": "4.9.33" + "version": "4.9.34" }, "default_locale": "en-US", "description": { @@ -164,7 +164,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-05-28T14:02:13Z", + "last_updated": "2021-07-07T12:32:16Z", "name": { "ar": "Dark Reader", "bn": "Dark Reader", @@ -237,10 +237,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5638, - "bayesian_average": 4.562429320383016, - "count": 3705, - "text_count": 1201 + "average": 4.5605, + "bayesian_average": 4.559135722557494, + "count": 3738, + "text_count": 1212 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", "requires_payment": false, @@ -337,7 +337,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 23027 + "weekly_downloads": 21397 }, "notes": null }, @@ -353,7 +353,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/5/5474/5474073.png?modif…" } ], - "average_daily_users": 701105, + "average_daily_users": 675428, "categories": { "android": [ "security-privacy" @@ -365,30 +365,30 @@ "contributions_url": "https://www.paypal.me/SupportEFF?utm_content=product-page-contribute&utm_me…", "created": "2010-09-16T15:09:10Z", "current_version": { - "id": 5216160, + "id": 5265391, "compatibility": { "firefox": { - "min": "42.0", + "min": "52.0", "max": "*" }, "android": { - "min": "48.0", + "min": "52.0", "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/https-everywhere/versions…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/https-everywhere/versions…", "files": [ { - "id": 3760520, - "created": "2021-04-15T09:00:17Z", - "hash": "sha256:8f6342077515669f73ae377346da4447428544559c870678488fa5b6b63d2500", + "id": 3809748, + "created": "2021-07-13T22:01:19Z", + "hash": "sha256:e261461b5d4d3621285fce70773558184d691c614b330744dab672f032db731c", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 1752551, + "size": 1752121, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/3760520/https_everywhere-…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3809748/https_everywhere-…", "permissions": [ "webNavigation", "webRequest", @@ -409,13 +409,13 @@ "name": { "en-US": "Multiple" }, - "url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/license/202…" + "url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/license/202…" }, "release_notes": { - "en-US": "2021.4.15\n* Add DuckDuckGo Smarter Encryption update channel\n* Bloom filter for rulesets\n* Firefox Fenix option page updates for Android users\n* Move to Python 3 from Python 3.6\n* Fix undefined type access\n* Fix empty default types" + "en-US": "2021.7.13\n* Amend Incognito Key for Chrome and Firefox #20092\n* Fix unexpected arithmetic operations on strings #20043\n* Remove Top Alexa Labeller #20083\n* Update deprecated log function #20101\n* Patch Chrome Test Failure #20102" }, "reviewed": null, - "version": "2021.4.15" + "version": "2021.7.13" }, "default_locale": "en-US", "description": { @@ -451,7 +451,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-04-15T09:13:13Z", + "last_updated": "2021-07-14T06:03:40Z", "name": { "de": "HTTPS Everywhere", "en-US": "HTTPS Everywhere", @@ -486,10 +486,10 @@ "category": "recommended" }, "ratings": { - "average": 4.6639, - "bayesian_average": 4.661394338186861, - "count": 2077, - "text_count": 409 + "average": 4.6649, + "bayesian_average": 4.662391975486979, + "count": 2086, + "text_count": 411 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/reviews/", "requires_payment": false, @@ -523,7 +523,7 @@ "type": "extension", "url": "https://www.eff.org/https-everywhere", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/https-everywhere/versions/", - "weekly_downloads": 13589 + "weekly_downloads": 12733 }, "notes": null }, @@ -539,7 +539,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/6/6937/6937656.png?modif…" } ], - "average_daily_users": 199619, + "average_daily_users": 193998, "categories": { "android": [ "security-privacy" @@ -752,10 +752,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8009, - "bayesian_average": 4.796141725881215, - "count": 1130, - "text_count": 217 + "average": 4.7991, + "bayesian_average": 4.794355030935285, + "count": 1140, + "text_count": 220 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -851,7 +851,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 4431 + "weekly_downloads": 4186 }, "notes": null }, @@ -867,7 +867,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/5/5474/5474073.png?modif…" } ], - "average_daily_users": 937932, + "average_daily_users": 901688, "categories": { "android": [ "security-privacy" @@ -1411,10 +1411,10 @@ "category": "recommended" }, "ratings": { - "average": 4.7902, - "bayesian_average": 4.787290030686736, - "count": 1845, - "text_count": 370 + "average": 4.7875, + "bayesian_average": 4.784597137496271, + "count": 1859, + "text_count": 371 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1434,7 +1434,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 16454 + "weekly_downloads": 15183 }, "notes": null }, @@ -1450,7 +1450,7 @@ "picture_url": null } ], - "average_daily_users": 4807454, + "average_daily_users": 4640025, "categories": { "android": [ "security-privacy" @@ -1462,7 +1462,7 @@ "contributions_url": "", "created": "2015-04-25T07:26:22Z", "current_version": { - "id": 5254372, + "id": 5262085, "compatibility": { "firefox": { "min": "57.0", @@ -1473,19 +1473,19 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/52…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/ublock-origin/versions/52…", "files": [ { - "id": 3798731, - "created": "2021-06-19T15:31:09Z", - "hash": "sha256:384f3e5241f87e90c376fb6964842ce204743feed554b8b7dabe09f119ea7d66", + "id": 3806442, + "created": "2021-07-06T14:33:48Z", + "hash": "sha256:31f8c2126a3f4e3cfe3ef63550b842a5d4f071ec1c6e5aa377c2f29b11ff1415", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 2820672, + "size": 2823571, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/3798731/ublock_origin-1.3…", + "url": "https://addons.mozilla.org/firefox/downloads/file/3806442/ublock_origin-1.3…", "permissions": [ "dns", "menus", @@ -1541,10 +1541,10 @@ "url": "http://www.gnu.org/licenses/gpl-3.0.html" }, "release_notes": { - "en-US": "<a href=\"https://outgoing.prod.mozaws.net/v1/9f806d450f0bb51f8c3a680f27169e335ad8c02…" rel=\"nofollow\">Complete release notes</a>.\n\n<b>Closed as fixed</b>\n\n<ul><li><a href=\"https://outgoing.prod.mozaws.net/v1/00a8778da7c67adfa5cc3bbdc4af6f843f3596f…" rel=\"nofollow\">Bizarre perf drain when ajaxing in 90,000 DOM nodes in a react component</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/976d8b716147c39299242ece7c89c9fe63ce812…" rel=\"nofollow\">Google Tag Manager eventCallback in a populated dataLayer not called</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/e336839918e89ae2b22dce75f2eee4024a6a1b1…" rel=\ "nofollow\">Countering a removeparam filter causes page-redirect problem</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/43e1c2ed2a0c66cac32ae5e137ae885e034369f…" rel=\"nofollow\">Asset viewer shows no space between !#endif and a comment line in uBlock's list</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/55294c2ace343eeb9f6ed323b6464dfd84b4173…" rel=\"nofollow\">Text in Manage Extension Shortcuts includes escaped <code>&shy;</code></a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/73eb512082e3d16e39b466a3099eda65c7e9a20…" rel=\"nofollow\">In popup, the Reload button becomes immediately hidden if re-enabling the large power button too quickly</a></li></ul>\n<b>Notable commits without en entry in the issue tracker</b>\n\n<ul><li><a href=\"https://outgoing.prod.mozaws.net/v1/a2d4db0757726512fa2da34780b0a274fe4688c…" rel=\"nofollow\">Add ability to linger for <code>remove-class</code> scriptlet</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/05a4025f4e850a5d4150433e8bf515073b7f0c0…" rel=\"nofollow\">Add empty array, object to set-constant scriptlet</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/a99edd7e6e4f330ef91b436b23b8f9401af4fc6…" rel=\"nofollow\">Fix potential exception when casting to string</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/7b3ebbbc13833b075dc0ab0af114ba88c8e1d5a… /gorhill/uBlock/commit/8cd2a1d263a96421487b39040c1d23eb01169484\" rel=\"nofollow\">Make googletagmanager<em>gtm.js an alias of google-analytics</em>analytics.js</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/e60e518a96d998c94124bb450b8c8f8632f94d3…" rel=\"nofollow\">Ensure getter/setter are called with proper context</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/6645b98ed2caac0283509afccfcadd17182f587…" rel=\"nofollow\">Allow filter list subscription through context menu</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/ec7cc511dc5622187fd057c2e3f9cd8d7579652…" rel=\"nofollow\">Keep reporting last time \"out of date\" lists were up dated</a></li><li><a href=\"https://outgoing.prod.mozaws.net/v1/4ccf11b8bcfbd1383eda2148f1d038898465774…" rel=\"nofollow\">Fix improper hashing of rules in classic popup panel</a></li></ul>\n<a href=\"https://outgoing.prod.mozaws.net/v1/14f36de2dfb16d9b82b8cef8fce11fd0e504e0f…" rel=\"nofollow\">Commits history since last version</a>." + "en-US": "<a href=\"https://outgoing.prod.mozaws.net/v1/5434dae3f84b4b698b24adb9b42ac5798fe9e71…" rel=\"nofollow\">Complete release notes</a>.\n\n<b>Closed as fixed</b>\n\n<ul><li><a href=\"https://outgoing.prod.mozaws.net/v1/683064916343a0100b76a2b61b6f3a86ab3b68f…" rel=\"nofollow\">DoS with strict-blocking filter</a></li></ul>\n<a href=\"https://outgoing.prod.mozaws.net/v1/8a8fc68c13e487c5d368677c3c826a0cc984d26…" rel=\"nofollow\">Commits history since last version</a>." }, "reviewed": null, - "version": "1.36.0" + "version": "1.36.2" }, "default_locale": "en-US", "description": { @@ -1634,7 +1634,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2021-06-24T15:15:36Z", + "last_updated": "2021-07-12T22:40:36Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1779,10 +1779,10 @@ "category": "recommended" }, "ratings": { - "average": 4.767, - "bayesian_average": 4.766555724017786, - "count": 12032, - "text_count": 3295 + "average": 4.7675, + "bayesian_average": 4.767057239998241, + "count": 12136, + "text_count": 3316 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1837,7 +1837,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 114937 + "weekly_downloads": 108865 }, "notes": null }, @@ -1853,7 +1853,7 @@ "picture_url": null } ], - "average_daily_users": 57089, + "average_daily_users": 57501, "categories": { "android": [ "photos-media" @@ -1973,10 +1973,10 @@ "category": "recommended" }, "ratings": { - "average": 4.5185, - "bayesian_average": 4.513490692203433, - "count": 1001, - "text_count": 380 + "average": 4.5204, + "bayesian_average": 4.515383003232922, + "count": 1005, + "text_count": 382 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -2004,7 +2004,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 300 + "weekly_downloads": 238 }, "notes": null }, @@ -2020,7 +2020,7 @@ "picture_url": null } ], - "average_daily_users": 95664, + "average_daily_users": 92573, "categories": { "android": [ "experimental", @@ -2159,10 +2159,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4818, - "bayesian_average": 4.46681046808246, - "count": 330, - "text_count": 92 + "average": 4.4743, + "bayesian_average": 4.459290174111107, + "count": 331, + "text_count": 93 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/reviews/", "requires_payment": false, @@ -2188,7 +2188,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 6894 + "weekly_downloads": 1270 }, "notes": null }, @@ -2204,7 +2204,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/12/12929/12929064.png?mo…" } ], - "average_daily_users": 170577, + "average_daily_users": 169807, "categories": { "android": [ "photos-media", @@ -2426,10 +2426,10 @@ "category": "recommended" }, "ratings": { - "average": 4.657, - "bayesian_average": 4.6514359731704635, - "count": 933, - "text_count": 181 + "average": 4.6589, + "bayesian_average": 4.653366424227091, + "count": 944, + "text_count": 186 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", "requires_payment": false, @@ -2465,7 +2465,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 3494 + "weekly_downloads": 6258 }, "notes": null }, @@ -2488,7 +2488,7 @@ "picture_url": null } ], - "average_daily_users": 42335, + "average_daily_users": 43242, "categories": { "android": [ "other" @@ -2770,10 +2770,10 @@ "category": "recommended" }, "ratings": { - "average": 4.4574, - "bayesian_average": 4.452573414888262, - "count": 1021, - "text_count": 278 + "average": 4.4546, + "bayesian_average": 4.449765155570907, + "count": 1025, + "text_count": 281 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2793,7 +2793,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/versions/", - "weekly_downloads": 28 + "weekly_downloads": 57 }, "notes": null }, @@ -2809,7 +2809,7 @@ "picture_url": "https://addons.cdn.mozilla.net/user-media/userpics/0/0/143.png?modified=150…" } ], - "average_daily_users": 354639, + "average_daily_users": 341957, "categories": { "android": [ "performance", @@ -3034,10 +3034,10 @@ "category": "recommended" }, "ratings": { - "average": 4.3797, - "bayesian_average": 4.37700001222646, - "count": 1791, - "text_count": 719 + "average": 4.3803, + "bayesian_average": 4.377601092060284, + "count": 1801, + "text_count": 720 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -3094,7 +3094,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 8264 + "weekly_downloads": 8002 }, "notes": null }, @@ -3110,7 +3110,7 @@ "picture_url": null } ], - "average_daily_users": 113290, + "average_daily_users": 109945, "categories": { "android": [ "performance", @@ -3243,10 +3243,10 @@ "category": "recommended" }, "ratings": { - "average": 3.9036, - "bayesian_average": 3.899325383200061, - "count": 985, - "text_count": 354 + "average": 3.9077, + "bayesian_average": 3.903408628046669, + "count": 986, + "text_count": 355 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -3285,7 +3285,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1683 + "weekly_downloads": 1385 }, "notes": null } diff --git a/rbm.conf b/rbm.conf index 191924d..5972405 100644 --- a/rbm.conf +++ b/rbm.conf @@ -57,7 +57,7 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '10.5.2' + torbrowser_version: '10.5.3' torbrowser_build: 'build1' torbrowser_incremental_from: - 10.0.18

1 0

[tor-browser-build/maint-10.5] Bug 40321: Check glean_parser version needed by application-services
by sysrqb＠torproject.org 16 Jul '21

16 Jul '21

commit a46380e6147b17c6a83eff679438df8f101a666d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jun 29 18:51:41 2021 +0200 Bug 40321: Check glean_parser version needed by application-services --- projects/application-services/config | 15 +++++++++++++ .../list_toolchain_updates_checks | 25 +++++++++++----------- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/projects/application-services/config b/projects/application-services/config index 93f8f5c..c76afe1 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -99,6 +99,21 @@ steps: var: container: use_container: 0 + get_android_components_version: | + #!/bin/bash + read -d '' p << 'EOF' || true + if (m/^\\s*android_components_version\\s=\\s'([^']*)'/) { + print $1; + exit; + } + EOF + perl -ne "$p" < build.gradle + android_components_version: '[% exec(c("var/get_android_components_version")) %]' + glean_version: '[% pc("android-components", "var/glean_version", { git_hash => "v" _ c("var/android_components_version") }) %]' + input_files: + - name: glean + project: glean + pkg_type: src get_gradle_dependencies_list: filename: 'gradle-dependencies-list-[% c("version") %].txt' diff --git a/projects/application-services/list_toolchain_updates_checks b/projects/application-services/list_toolchain_updates_checks index b028d10..f80eda8 100644 --- a/projects/application-services/list_toolchain_updates_checks +++ b/projects/application-services/list_toolchain_updates_checks @@ -36,6 +36,19 @@ current=21 check_update_needed minSdkVersion "$needed" "$current" +# glean_parser +read -d '' p << 'EOF' || true +if (m/^\\s*"glean_parser==([^"]+)",/) { + print $1; + exit; +} +EOF +tar xf $rootdir/[% c('input_files_by_name/glean') %] +needed=$(cat glean-[% c("var/glean_version") %]/glean-core/python/setup.py | perl -ne "$p") +current='[% c("var/glean_parser") %]' +check_update_needed glean_parser "$needed" "$current" + + # gradle read -d '' p << 'EOF' || true if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { @@ -83,15 +96,3 @@ needed=$(cat build.gradle | perl -ne "$p") current='4.0.1' check_update_needed android-gradle-plugin "$needed" "$current" - -# android-components -read -d '' p << 'EOF' || true -if (m/^\\s*android_components_version\\s=\\s'([^']*)'/) { - print $1; - exit; -} -EOF -needed=$(cat build.gradle | perl -ne "$p") -current=71.0.0 -check_update_needed android-components "$needed" "$current" -

1 0