tbb-commits
Threads by month
- ----- 2026 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 1 participants
- 21326 discussions
[tor-browser/tor-browser-78.13.0esr-10.5-2] Bug 11641: change TBB directory structure to be more like Firefox's
by sysrqb＠torproject.org 12 Aug '21
by sysrqb＠torproject.org 12 Aug '21
12 Aug '21
commit 6f70f56c3230b10efb4eed79a8f9e036199909c4
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Tue Apr 29 13:08:24 2014 -0400
Bug 11641: change TBB directory structure to be more like Firefox's
Unless the -osint command line flag is used, the browser now defaults
to the equivalent of -no-remote. There is a new -allow-remote flag that
may be used to restore the original (Firefox-like) default behavior.
---
toolkit/xre/nsAppRunner.cpp | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 9854332f6917..69006b49250e 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1429,8 +1429,10 @@ static void DumpHelp() {
" --migration Start with migration wizard.\n"
" --ProfileManager Start with ProfileManager.\n"
#ifdef MOZ_HAS_REMOTE
- " --no-remote Do not accept or send remote commands; implies\n"
+ " --no-remote (default) Do not accept or send remote commands; "
+ "implies\n"
" --new-instance.\n"
+ " --allow-remote Accept and send remote commands.\n"
" --new-instance Open new instance, not a new window in running "
"instance.\n"
#endif
@@ -3543,16 +3545,25 @@ int XREMain::XRE_mainInit(bool* aExitFlag) {
gSafeMode);
#if defined(MOZ_HAS_REMOTE)
+ // In Tor Browser, remoting is disabled by default unless -osint is used.
+ bool allowRemote = (CheckArg("allow-remote") == ARG_FOUND);
+ bool isOsint = (CheckArg("osint", nullptr, CheckArgFlag::None) == ARG_FOUND);
+ if (!allowRemote && !isOsint) {
+ SaveToEnv("MOZ_NO_REMOTE=1");
+ }
// Handle --no-remote and --new-instance command line arguments. Setup
// the environment to better accommodate other components and various
// restart scenarios.
ar = CheckArg("no-remote");
- if (ar == ARG_FOUND || EnvHasValue("MOZ_NO_REMOTE")) {
+ if ((ar == ARG_FOUND) && allowRemote) {
+ PR_fprintf(PR_STDERR,
+ "Error: argument --no-remote is invalid when argument "
+ "--allow-remote is specified\n");
+ return 1;
+ }
+ if (EnvHasValue("MOZ_NO_REMOTE")) {
mDisableRemoteClient = true;
mDisableRemoteServer = true;
- if (!EnvHasValue("MOZ_NO_REMOTE")) {
- SaveToEnv("MOZ_NO_REMOTE=1");
- }
}
ar = CheckArg("new-instance");
1
0
[tor-browser/tor-browser-78.13.0esr-10.5-2] Bug 21431: Clean-up system extensions shipped in Firefox
by sysrqb＠torproject.org 12 Aug '21
by sysrqb＠torproject.org 12 Aug '21
12 Aug '21
commit 9df0641f4b02f6e6b697af66e22279c78fc0147b
Author: Kathy Brade <brade(a)pearlcrescent.com>
Date: Tue May 23 17:05:29 2017 -0400
Bug 21431: Clean-up system extensions shipped in Firefox
Only ship the pdfjs extension.
---
browser/components/BrowserGlue.jsm | 6 ++++++
browser/extensions/moz.build | 5 -----
browser/installer/package-manifest.in | 1 -
browser/locales/Makefile.in | 8 --------
browser/locales/jar.mn | 7 -------
5 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
index 3b7d8d6e0309..3363e24a9b56 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -2076,6 +2076,9 @@ BrowserGlue.prototype = {
const ID = "screenshots(a)mozilla.org";
const _checkScreenshotsPref = async () => {
let addon = await AddonManager.getAddonByID(ID);
+ if (!addon) {
+ return;
+ }
let disabled = Services.prefs.getBoolPref(PREF, false);
if (disabled) {
await addon.disable({ allowSystemAddons: true });
@@ -2092,6 +2095,9 @@ BrowserGlue.prototype = {
const ID = "webcompat-reporter(a)mozilla.org";
Services.prefs.addObserver(PREF, async () => {
let addon = await AddonManager.getAddonByID(ID);
+ if (!addon) {
+ return;
+ }
let enabled = Services.prefs.getBoolPref(PREF, false);
if (enabled && !addon.isActive) {
await addon.enable({ allowSystemAddons: true });
diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
index fd2e65d01f02..499c59b8d6a5 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -5,12 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += [
- 'doh-rollout',
- 'formautofill',
'pdfjs',
- 'screenshots',
- 'webcompat',
- 'report-site-issue'
]
if not CONFIG['TOR_BROWSER_DISABLE_TOR_LAUNCHER']:
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 53b0b7ddf731..ad7dd023a92e 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -268,7 +268,6 @@
@RESPATH@/browser/chrome/icons/default/default64.png
@RESPATH@/browser/chrome/icons/default/default128.png
#endif
-@RESPATH@/browser/features/*
; [DevTools Startup Files]
@RESPATH@/browser/chrome/devtools-startup@JAREXT@
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
index 05f0242c5248..1fdf34d9460f 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -58,10 +58,6 @@ libs-%:
@$(MAKE) -C ../../toolkit/locales libs-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
-ifneq (,$(wildcard ../extensions/formautofill/locales))
- @$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$*
-endif
- @$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
@$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)'
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
@@ -75,14 +71,10 @@ chrome-%:
@$(MAKE) -C ../../toolkit/locales chrome-$*
@$(MAKE) -C ../../services/sync/locales chrome AB_CD=$*
@$(MAKE) -C ../../extensions/spellcheck/locales chrome AB_CD=$*
-ifneq (,$(wildcard ../extensions/formautofill/locales))
- @$(MAKE) -C ../extensions/formautofill/locales chrome AB_CD=$*
-endif
@$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$*
@$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$*
@$(MAKE) chrome AB_CD=$*
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$*
- @$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$*
package-win32-installer: $(SUBMAKEFILES)
$(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index 31e2d3d870e6..ff577dfd4e7c 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -60,10 +60,3 @@
locale/browser/newInstall.dtd (%chrome/browser/newInstall.dtd)
locale/browser/brandings.dtd (%chrome/browser/brandings.dtd)
locale/browser/fxmonitor.properties (%chrome/browser/fxmonitor.properties)
-
-#ifdef XPI_NAME
-# Bug 1240628, restructure how l10n repacks work with feature addons
-# This is hacky, but ensures the chrome.manifest chain is complete
-[.] chrome.jar:
-% manifest features/chrome.manifest
-#endif
1
0
[tor-browser/tor-browser-78.13.0esr-10.5-2] Bug 21830: Copying large text from web console leaks to /tmp
by sysrqb＠torproject.org 12 Aug '21
by sysrqb＠torproject.org 12 Aug '21
12 Aug '21
commit f97d1cc021b653680f04c6bf14e7c91d6c4bc6d4
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Aug 4 05:55:49 2017 +0000
Bug 21830: Copying large text from web console leaks to /tmp
Patch written by Neill Miller
---
widget/nsTransferable.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/widget/nsTransferable.cpp b/widget/nsTransferable.cpp
index 9ccfc8639350..135135ab23a8 100644
--- a/widget/nsTransferable.cpp
+++ b/widget/nsTransferable.cpp
@@ -33,6 +33,7 @@ Notes to self:
#include "nsILoadContext.h"
#include "nsXULAppAPI.h"
#include "mozilla/UniquePtr.h"
+#include "mozilla/Preferences.h"
using namespace mozilla;
@@ -195,6 +196,11 @@ nsTransferable::Init(nsILoadContext* aContext) {
if (aContext) {
mPrivateData = aContext->UsePrivateBrowsing();
+ } else {
+ // without aContext here to provide PrivateBrowsing information,
+ // we defer to the active configured setting
+ mPrivateData =
+ mozilla::Preferences::GetBool("browser.privatebrowsing.autostart");
}
#ifdef DEBUG
mInitialized = true;
1
0
[tor-browser/tor-browser-78.13.0esr-10.5-2] Bug 23104: Add a default line height compensation
by sysrqb＠torproject.org 12 Aug '21
by sysrqb＠torproject.org 12 Aug '21
12 Aug '21
commit cb1f715fdbaf9273bd9ad584f57261dae5bba693
Author: Igor Oliveira <igor.oliveira(a)posteo.net>
Date: Sun Dec 10 18:16:59 2017 -0200
Bug 23104: Add a default line height compensation
Many fonts have issues with their vertical metrics. they
are used to influence the height of ascenders and depth
of descenders. Gecko uses it to calculate the line height
(font height + ascender + descender), however because of
that idiosyncratic behavior across multiple operating
systems, it can be used to identify the user's OS.
The solution proposed in the patch uses a default factor
to be multiplied with the font size, simulating the concept
of ascender and descender. This way all operating
systems will have the same line height only and only if the
frame is outside the chrome.
---
layout/generic/ReflowInput.cpp | 19 +++++++++---
layout/generic/test/mochitest.ini | 1 +
layout/generic/test/test_tor_bug23104.html | 50 ++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+), 5 deletions(-)
diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp
index 5b1f6d62043a..5da354f86558 100644
--- a/layout/generic/ReflowInput.cpp
+++ b/layout/generic/ReflowInput.cpp
@@ -30,6 +30,7 @@
#include <algorithm>
#include "mozilla/dom/HTMLInputElement.h"
#include "nsGridContainerFrame.h"
+#include "nsContentUtils.h"
using namespace mozilla;
using namespace mozilla::css;
@@ -2690,7 +2691,8 @@ void ReflowInput::CalculateBlockSideMargins(LayoutFrameType aFrameType) {
// For risk management, we use preference to control the behavior, and
// eNoExternalLeading is the old behavior.
-static nscoord GetNormalLineHeight(nsFontMetrics* aFontMetrics) {
+static nscoord GetNormalLineHeight(nsIContent* aContent,
+ nsFontMetrics* aFontMetrics) {
MOZ_ASSERT(nullptr != aFontMetrics, "no font metrics");
nscoord normalLineHeight;
@@ -2698,6 +2700,12 @@ static nscoord GetNormalLineHeight(nsFontMetrics* aFontMetrics) {
nscoord externalLeading = aFontMetrics->ExternalLeading();
nscoord internalLeading = aFontMetrics->InternalLeading();
nscoord emHeight = aFontMetrics->EmHeight();
+
+ if (nsContentUtils::ShouldResistFingerprinting() &&
+ !aContent->IsInChromeDocument()) {
+ return NSToCoordRound(emHeight * NORMAL_LINE_HEIGHT_FACTOR);
+ }
+
switch (GetNormalLineHeightCalcControl()) {
case eIncludeExternalLeading:
normalLineHeight = emHeight + internalLeading + externalLeading;
@@ -2715,7 +2723,8 @@ static nscoord GetNormalLineHeight(nsFontMetrics* aFontMetrics) {
return normalLineHeight;
}
-static inline nscoord ComputeLineHeight(ComputedStyle* aComputedStyle,
+static inline nscoord ComputeLineHeight(nsIContent* aContent,
+ ComputedStyle* aComputedStyle,
nsPresContext* aPresContext,
nscoord aBlockBSize,
float aFontSizeInflation) {
@@ -2743,7 +2752,7 @@ static inline nscoord ComputeLineHeight(ComputedStyle* aComputedStyle,
RefPtr<nsFontMetrics> fm = nsLayoutUtils::GetFontMetricsForComputedStyle(
aComputedStyle, aPresContext, aFontSizeInflation);
- return GetNormalLineHeight(fm);
+ return GetNormalLineHeight(aContent, fm);
}
nscoord ReflowInput::CalcLineHeight() const {
@@ -2765,7 +2774,7 @@ nscoord ReflowInput::CalcLineHeight(nsIContent* aContent,
float aFontSizeInflation) {
MOZ_ASSERT(aComputedStyle, "Must have a ComputedStyle");
- nscoord lineHeight = ComputeLineHeight(aComputedStyle, aPresContext,
+ nscoord lineHeight = ComputeLineHeight(aContent, aComputedStyle, aPresContext,
aBlockBSize, aFontSizeInflation);
NS_ASSERTION(lineHeight >= 0, "ComputeLineHeight screwed up");
@@ -2778,7 +2787,7 @@ nscoord ReflowInput::CalcLineHeight(nsIContent* aContent,
if (!lh.IsNormal()) {
RefPtr<nsFontMetrics> fm = nsLayoutUtils::GetFontMetricsForComputedStyle(
aComputedStyle, aPresContext, aFontSizeInflation);
- nscoord normal = GetNormalLineHeight(fm);
+ nscoord normal = GetNormalLineHeight(aContent, fm);
if (lineHeight < normal) {
lineHeight = normal;
}
diff --git a/layout/generic/test/mochitest.ini b/layout/generic/test/mochitest.ini
index f6678d8d8e4e..c1602bbbc6b1 100644
--- a/layout/generic/test/mochitest.ini
+++ b/layout/generic/test/mochitest.ini
@@ -161,3 +161,4 @@ skip-if = debug == true || tsan # the test is slow. tsan: bug 1612707
[test_reframe_for_lazy_load_image.html]
support-files =
file_reframe_for_lazy_load_image.html
+[test_tor_bug23104.html]
diff --git a/layout/generic/test/test_tor_bug23104.html b/layout/generic/test/test_tor_bug23104.html
new file mode 100644
index 000000000000..8ff1d2190c45
--- /dev/null
+++ b/layout/generic/test/test_tor_bug23104.html
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML>
+<meta charset="UTF-8">
+<html>
+<head>
+ <title>Test for Tor Bug #23104: CSS line-height reveals the platform Tor browser is running</title>
+ <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+ <script type="application/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
+ <style type="text/css">
+ span {
+ background-color: #000;
+ color: #fff;
+ font-size: 16.5px;
+ }
+ </style>
+</head>
+<body>
+<span id="test1">Test1</span>
+<span id="test2">كلمة</span>
+<span id="test3">ação</span>
+<script>
+
+let setPref = async function (key, value) {
+ await SpecialPowers.pushPrefEnv({"set": [[key, value]]});
+}
+
+function getStyle(el, styleprop) {
+ el = document.getElementById(el);
+ return document.defaultView.getComputedStyle(el, null).getPropertyValue(styleprop);
+}
+
+function validateElement(elementName, isFingerprintResistent) {
+ var fontSize = getStyle(elementName, 'font-size');
+ var lineHeight = getStyle(elementName, 'line-height');
+ var validationCb = isFingerprintResistent ? is : isnot;
+ validationCb(parseFloat(lineHeight), Math.round(parseFloat(fontSize)) * 1.2, 'Line Height validation');
+}
+
+add_task(async function() {
+ await setPref("layout.css.line-height.normal-as-resolved-value.enabled", false);
+ for (let resistFingerprintingValue of [true, false]) {
+ await setPref("privacy.resistFingerprinting", resistFingerprintingValue);
+ for (let elementId of ['test1', 'test2', 'test3']) {
+ validateElement(elementId, resistFingerprintingValue);
+ }
+ }
+});
+
+</script>
+</body>
+</html>
1
0
[tor-browser/tor-browser-78.13.0esr-10.5-2] Bug 26353: Prevent speculative connect that violated FPI.
by sysrqb＠torproject.org 12 Aug '21
by sysrqb＠torproject.org 12 Aug '21
12 Aug '21
commit 6f9aec8b18a4567ecba75d800001d79bb37f8284
Author: Arthur Edelstein <arthuredelstein(a)gmail.com>
Date: Sat Jul 14 08:50:55 2018 -0700
Bug 26353: Prevent speculative connect that violated FPI.
Connections were observed in the catch-all circuit when
the user entered an https or http URL in the URL bar, or
typed a search term.
---
toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm b/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
index ffa42297073e..82c7a3b950c2 100644
--- a/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
+++ b/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
@@ -74,6 +74,9 @@ class RemoteWebNavigation {
fixupFlags |= Services.uriFixup.FIXUP_FLAG_PRIVATE_CONTEXT;
}
uri = Services.uriFixup.createFixupURI(aURI, fixupFlags);
+/*******************************************************************************
+ TOR BROWSER: Disable the following speculative connect until
+ we can make it properly obey first-party isolation.
// We know the url is going to be loaded, let's start requesting network
// connection before the content process asks.
@@ -97,6 +100,7 @@ class RemoteWebNavigation {
}
Services.io.speculativeConnect(uri, principal, null);
}
+*******************************************************************************/
} catch (ex) {
// Can't setup speculative connection for this uri string for some
// reason (such as failing to parse the URI), just ignore it.
1
0
commit d6dc6333dedca4a7a1c64a273541aab9e578bd73
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Thu Aug 12 04:07:48 2021 +0000
Tag build2
---
rbm.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rbm.conf b/rbm.conf
index 997a196..f384e0c 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -58,9 +58,9 @@ buildconf:
var:
torbrowser_version: '11.0a4'
- torbrowser_build: 'build1'
+ torbrowser_build: 'build2'
torbrowser_incremental_from:
- - 11.0a3
+ - 11.0a2
project_name: tor-browser
multi_lingual: 0
build_mar: 1
1
0
[Git][tpo/applications/fenix] Pushed new tag tor-browser-91.1.0-11.0-1-build1
by Matthew Finkel (＠sysrqb) 10 Aug '21
by Matthew Finkel (＠sysrqb) 10 Aug '21
10 Aug '21
Matthew Finkel pushed new tag tor-browser-91.1.0-11.0-1-build1 at The Tor Project / Applications / fenix
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-91.…
You're receiving this email because of your account on gitlab.torproject.org.
1
0
[Git][tpo/applications/fenix][tor-browser-91.1.0-11.0-1] squash! Modify UI/UX
by Matthew Finkel (＠sysrqb) 10 Aug '21
by Matthew Finkel (＠sysrqb) 10 Aug '21
10 Aug '21
Matthew Finkel pushed to branch tor-browser-91.1.0-11.0-1 at The Tor Project / Applications / fenix
Commits:
d909d687 by Matthew Finkel at 2021-08-10T22:49:01+00:00
squash! Modify UI/UX
Bug 40186: Hide Credit Cards in Settings
- - - - -
2 changed files:
- app/src/main/res/xml/account_settings_preferences.xml
- app/src/main/res/xml/preferences.xml
Changes:
=====================================
app/src/main/res/xml/account_settings_preferences.xml
=====================================
@@ -31,7 +31,6 @@
<CheckBoxPreference
android:defaultValue="true"
- android:visible="false"
android:key="@string/pref_key_sync_credit_cards"
android:layout="@layout/checkbox_left_preference"
android:title="@string/preferences_sync_credit_cards" />
=====================================
app/src/main/res/xml/preferences.xml
=====================================
@@ -74,6 +74,7 @@
<androidx.preference.Preference
app:iconSpaceReserved="false"
+ app:isPreferenceVisible="false"
android:key="@string/pref_key_credit_cards"
android:title="@string/preferences_credit_cards" />
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/d909d687f824b…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/d909d687f824b…
You're receiving this email because of your account on gitlab.torproject.org.
1
0
10 Aug '21
commit d9961a7a8ff9e09cafbbf98c7b5f1637deda4290
Author: Matthew Finkel <sysrqb(a)torproject.org>
Date: Mon Aug 9 22:49:45 2021 +0000
Release preparations for 11.0a4
Version and Changelog updates
---
projects/android-components/config | 4 +-
.../gradle-dependencies-list.txt | 4 +-
projects/fenix/config | 4 +-
projects/fenix/gradle-dependencies-list.txt | 348 ++++++++++-----------
projects/firefox/config | 4 +-
projects/geckoview/config | 2 +-
projects/go/config | 4 +-
.../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 +
rbm.conf | 4 +-
9 files changed, 203 insertions(+), 187 deletions(-)
diff --git a/projects/android-components/config b/projects/android-components/config
index 01e27ec..e5780ca 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: 91.0.8
+ android_components_version: 91.0.12
torbrowser_branch: 11.0
container:
use_container: 1
# This should be updated when the list of gradle dependencies is changed.
- gradle_dependencies_version: 29
+ gradle_dependencies_version: 30
gradle_version: 6.6.1
glean_parser: 3.4.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 89764cf..8eb0ce7 100644
--- a/projects/android-components/gradle-dependencies-list.txt
+++ b/projects/android-components/gradle-dependencies-list.txt
@@ -408,8 +408,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.…
-b1f621caee72ebde401c5f483d730715c7263521a21270d8c5c147aacbead074 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/91.0.…
-894d04f6dbeb7c83b13a2794f41321f3d761d20a1bede4e2f8d1b61cd3b02213 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/91.0.…
+2f7ac2fa7e9920d8c4db072f79c0e829237e3624f350771d998399348e0604cb | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/91.0.20210…
+c6b0eb0a6a703d7133d729b602807ebe0e1ffbabd2335497265d82aea4f03696 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/91.0.20210…
6424962ef4d9fe24d89e7d515db6fe0eef5ce6b57872a1765c9d8bc1a0fd7965 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3…
5b75897df59e9710ce53e4e7535a4bfba5949b9d59cb4d2c1603e901b78bb41d | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3…
4998a4e21f13260447b2279deba3173da1ee7c0088e04f123242c235d0f7afed | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/…
diff --git a/projects/fenix/config b/projects/fenix/config
index 4817a95..a465fca 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -8,14 +8,14 @@ gpg_keyring: torbutton.gpg
variant: Beta
var:
- fenix_version: 91.0.0b5
+ fenix_version: 91.1.0
torbrowser_branch: 11.0
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: 30
+ gradle_dependencies_version: 31
gradle_version: 6.5.1
glean_parser: 3.4.0
diff --git a/projects/fenix/gradle-dependencies-list.txt b/projects/fenix/gradle-dependencies-list.txt
index ce7fd2d..62b0b5c 100644
--- a/projects/fenix/gradle-dependencies-list.txt
+++ b/projects/fenix/gradle-dependencies-list.txt
@@ -395,180 +395,180 @@ cfb643463a30e1dd8a9516242b29dc97fac29ee0752d9b27d1ec8d915f33f947 | https://maven
b316246a733f635a3e42225fb5482160fd796ec14668649e2e0d1a393ea83e98 | https://maven.mozilla.org/maven2/org/mozilla/appservices/syncmanager/79.0.0…
b5e698a21e4b1ef965af79d1dc44020b10278a24ed94fdfb8a87cd0fc7e3862a | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/79.0.0/tabs-7…
248ab2a12ef6feb4d22f7e7d4183003d3fa984ffdbbd05809e6601cc2f86d348 | https://maven.mozilla.org/maven2/org/mozilla/appservices/tabs/79.0.0/tabs-7…
-a814d9928d95924b3700be88e707f495d1c2a212616f70bee09116fd4fd353d9 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-awesomebar/…
-0e984000e625ce0955dda87927f5e81ea313eec74248bac97498f4a6c35f2d69 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-awesomebar/…
-c404ac90f6d24d17099ed1bbee57057f11ddf012356da0132901c2fd56c4a48d | https://maven.mozilla.org/maven2/org/mozilla/components/browser-domains/91.…
-90b0e65e183e4976167c3acd34d07b909e7fc28f11929d25323573b7d96a0668 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-domains/91.…
-d8d7001042f9fa1c8b1207d992271c32e8fcbf705e659cf32b1cab9a67d55079 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck…
-af94ad90c21da7a42c64915363c0ddbcda577b0b16cb441a94f2b89fc60772b6 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck…
-8a2be07551135b93243842c07c75b0a5af165721a79c38e5b50c818cc905aac8 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-errorpages/…
-bf2cdb4a5bb5e1e068e2e33f8d0e11e4f0cb7f79669b30ff2cbe017c2e0c56cb | https://maven.mozilla.org/maven2/org/mozilla/components/browser-errorpages/…
-40892512e4ee47873fa837c2ba52d0726bd9cb48520a4cba4d3cb0c5ed956514 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-icons/91.0.…
-a8bed85c9d84f78d4a032959d3c1b45dff8c389f620ed454f7b25a543b951511 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-icons/91.0.…
-1ea5a019d2686e9729e06f76f9ba1fc575498bb6e466cb68fa4e42fe6afa925e | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu/91.0.8…
-bdd94c034c0bef3fc27a180cbfb5496e25898f989785973835bf89b63d00aa75 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu/91.0.8…
-70613303a83d53bf33436ed9a58b8192f390edd2c4cb556aceabae29a0d8bba5 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu2/91.0.…
-9d66cf83a1ae97de8b59ebe1316f69514186bce62d8fc3c7ab9e801efa869ff2 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu2/91.0.…
-3034158a1d3a769270f8ab50035af0795b6510c8532da6884d53c34498785ac1 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session-sto…
-ee3576e91d25b5ccfb7e0a1eb3fc637d8c598a3a343e97c7614fe126ff512b73 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session-sto…
-8fea4886875596d042c88615c61fdea5c57f2a1c354976aa3c91aa5c7cdc727d | https://maven.mozilla.org/maven2/org/mozilla/components/browser-state/91.0.…
-25c1a67365c1523ed64d13ac3f4c8f030cce341055a416cfeb44a858b7b0bb5a | https://maven.mozilla.org/maven2/org/mozilla/components/browser-state/91.0.…
-f36a7cc51f0157c7446a9345f9b2d8db1416ee6403ef54fefe7646bdce04117f | https://maven.mozilla.org/maven2/org/mozilla/components/browser-storage-syn…
-55de94dbb69073510a549c58a143888576e595d9c3a06a3a4ec45f76bbf57287 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-storage-syn…
-e07cf87814d2cbfc068158d6ee4978497e324da2f0f0332e24846627cbab0b7f | https://maven.mozilla.org/maven2/org/mozilla/components/browser-tabstray/91…
-dde3be451f10064475d1adf2100e0161e65994d289c2f71a33bf8fe703ac724b | https://maven.mozilla.org/maven2/org/mozilla/components/browser-tabstray/91…
-260fcdb293b89022d9900be100082fb98af7a19c63e3e55ae38ff472cbbf67f1 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-thumbnails/…
-3cf2bcd465336138499b5703da8a5f3b591f8d452f67d5df690f78e48f2105a3 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-thumbnails/…
-4b361aa290d713dc1278e00c0b0d93b911a6732ab14da6499d97a276fd81fa9e | https://maven.mozilla.org/maven2/org/mozilla/components/browser-toolbar/91.…
-8f548489284f961f5887098c038c36afae3f5f85ceb560b79707d263153be869 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-toolbar/91.…
-81047fa9360260b9d0b806553f32dacff7690d97166b6c3be74f8d2e4e996384 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-awesomebar/…
-733faf25676e94d641841f9aecf3b32188e0bdb0ab3557e89e4e3a1c02966d2e | https://maven.mozilla.org/maven2/org/mozilla/components/concept-awesomebar/…
-05d1e34b18ade731fadd602ec678147e028c0afebbaae68f5d068d439fdd5fc5 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/91.0.8…
-940b9fad0012b12ebbc59fab004e979a9ef768cc91bcfc8d84a98d1aaacd3b2e | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/91.0.8…
-475a72e6d0cc7f15502c9d370f3f3187b07a32f5ccfabe377898ad5a7dfd07d5 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-engine/91.0…
-74ac1598895151f9178b0ed03428869c7b8b195ba0e069970dd8eacb60410a34 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-engine/91.0…
-09c2278c26e234c949b3e4c4eafe81006544d3cd4aa3d7886c974182895d009a | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/91.0.…
-a5dd403857cf350aa9cfa0b33be6219a65915e465257f20e47b98fa1dc2db930 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/91.0.…
-5679dd6cd9ed24bbcddc9ac3dc32a82926cb0408b07c718c7f15ae079d22b63f | https://maven.mozilla.org/maven2/org/mozilla/components/concept-menu/91.0.8…
-b6ba1b9ac1a3ac5621ff5fb71953efa9182f693fcb21760f7b6b0fcbc2eadc50 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-menu/91.0.8…
-757e2fce90de1ad74d65b30376180778e1b19c6c5d97e99305d71095f25c9bea | https://maven.mozilla.org/maven2/org/mozilla/components/concept-push/91.0.8…
-c72125efd20aa2b1317645d86f5f985a3f0c3bb4bd3a8947eef5cb3bb65dd1a4 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-push/91.0.8…
-63b7dbd7864d24ae382ca2a7911065be8ed83976ba096988546f241cdea1a2e8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-storage/91.…
-9251f2b59c4042b7708a3a45370ae9aea90faf73385956c2406ac98aa8322b50 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-storage/91.…
-c63e0062d1af04dcbe547710041733af6b923e8fac9cb282d9350f4fe7e9a946 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-sync/91.0.8…
-71dcc8bf6cfffb95a6871a983c5f39fe329f7eaae38ff58efed79859de76dcae | https://maven.mozilla.org/maven2/org/mozilla/components/concept-sync/91.0.8…
-53a41d47d084a2f2d165dc505867daa04ae140d0c19941a1c0c824fbdf623e38 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-tabstray/91…
-164f54b99d301423519215a456dae4b6cea128d53f1af326b96332114fad1006 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-tabstray/91…
-b82626b31042cbb6e66adf53a391c9e1bdea490a4305093ca79b47324d6ec8af | https://maven.mozilla.org/maven2/org/mozilla/components/concept-toolbar/91.…
-3dd6e7be4e4fe367add8bff6645e55e8039c1ae6a15e3e1d009881ebaa6ac6a6 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-toolbar/91.…
-90b252b349accfddc506fb8d6e7398176eab0d9f2735ee5f3a654af7ad8e563a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts-pu…
-596b58055c5c6225e52e152699cefa0a635d6accffd7b5c698037c4ca1bd45ff | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts-pu…
-e1ff86d1e50b6eb2ebd940757a3bc3a0138db160715db6700c82ed66d2d036ed | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts/91…
-a8f044154642383f079ffcd661eaf7db592bc1425c632e65970bf707fe967b24 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts/91…
-1a5e9a3e3e86e4dd85fc2d80490c2e3218895dbe2442a347cc92e8654986fe72 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-addons/91.0…
-8038b8f2053ef107318d584f093524a13f780eef63a0f06eae487e1baee151f9 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-addons/91.0…
-1ceb54b52b72356482a700325389561d99a5eb408527592ddd052819ddccf8f6 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-app-links/9…
-cbd9d96687c3246d18c092fbd584d07027f4cb397de8b9ab5d99770ff7be4042 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-app-links/9…
-17a7ddfd71a4742b040db866251b43fefe27b38c607f46185e7af4247d82c73d | https://maven.mozilla.org/maven2/org/mozilla/components/feature-autofill/91…
-05a929a95c653437aed7a1bb0af7566faee3a9301977e49e15f7bfecedc8db37 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-autofill/91…
-b2ee0f7631138a7ffa5fc4801d202be7369a705e5115cd69a66c57e12635f662 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-awesomebar/…
-9de52edbaa746615680f370c18d84e94145632ea8dd456882abd9a2ddb2188fa | https://maven.mozilla.org/maven2/org/mozilla/components/feature-awesomebar/…
-1f9bc93b0d01da1d12da43eb6055080ff3fd104f898eaeaa922a03d4b312f71c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-contextmenu…
-ac8bddbe27430c85e55e069391f9816871851831877b3ea2df5b25e0da323226 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-contextmenu…
-2a12bf6f70a8cb8820207920a54992a2530de27ff27230be50eea7c391285761 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-customtabs/…
-6e2743454e1aea7d2810af7db26fa060f552c181c234983df6ac517db81221d0 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-customtabs/…
-37ca8d5e188626f77d17fa5a12b1e0722b2a41e4782e0b065e38cc9efdce78d7 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-downloads/9…
-245242840e635cd3f2a61bfcccf1f310b0e9638bc40806998051173ed4ec2b2a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-downloads/9…
-e24b2af5afebef58f4f6405ac36e0b80ffa3c076cee5b657aa95f46d0f8da837 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-findinpage/…
-731b45e1eb219b99d743d66db800b085e67f39ebbc6d00f7a2fab9fbc8170a13 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-findinpage/…
-15dad56af1e701b16bc6e71f00a936ce8ffe566692cc6ee973be03123935d0e5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-intent/91.0…
-85a5b17b5212212d8a28ca1b399e8854f27b088b8f03339e1ba202cb5d384527 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-intent/91.0…
-3c99177229ee0872a31b0952e29db6dd808b46be3a5d3f9629c4c398d77691c5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-logins/91.0…
-765cb2e4d3dca6ebbc1340852c5f34e6169022b255f01ad742d9078c16d2545f | https://maven.mozilla.org/maven2/org/mozilla/components/feature-logins/91.0…
-946c6caaf460c14554e74f07fc8dbea378f6c583f9f948ff23706224675b92ec | https://maven.mozilla.org/maven2/org/mozilla/components/feature-media/91.0.…
-cefb6884d42e93aeeb6b6834d0508f9acf38143b3f6a01afcd8bdb66d3c0872b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-media/91.0.…
-4e5de4c5976705d9076819a87ac6a077653511e7a0e8298baeef49e4719181ac | https://maven.mozilla.org/maven2/org/mozilla/components/feature-privatemode…
-b05545e6551958695aded312a3b6cd359e47717a04041e580a7f20f42ed3e095 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-privatemode…
-384e59bc50ab453d3f592603045f69afa7fea75649c064676a8f8f3426c33a54 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-prompts/91.…
-e551efe4b5db46e27f4d5349a468830d4ca321d0ed7063b5e2a17ce1f1b819b4 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-prompts/91.…
-bbe3587d9da82fab10b905d22ad0b5be94eb698aeb0e537d172bd3a4c25222b0 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-push/91.0.8…
-6f3d81152892b5a37d41b7c818bbcb07ee7714adad7d9c4a864905dcb7036e24 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-push/91.0.8…
-78208664191900c7d31d626b8070e56a377e69f99e91a2f2bfae02c0f771fa56 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-pwa/91.0.8/…
-2b7202cb6200c68da4297a81f7cc12826cf722a2467b964831805fba6e96904c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-pwa/91.0.8/…
-39be855565595b03087350ca0c4728d9c79b14b00572bfd217fd899235e1afcc | https://maven.mozilla.org/maven2/org/mozilla/components/feature-qr/91.0.8/f…
-879f2b0232088bacfc7fd81ed7111f140a2e73baa895430b8892342544bb1d47 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-qr/91.0.8/f…
-8559f194d8151264b1f71403dc9178e480dd0e0e5f4a982dd8d1682e16be8ded | https://maven.mozilla.org/maven2/org/mozilla/components/feature-readerview/…
-86e61edbf175ca268bc9e0c298a632874f068626096ab3cfa0a2654a8d1fda49 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-readerview/…
-62a8cb67977e6b7cecb9ae59ff628ee721b4ca228be2304eddb8425f17d70cbf | https://maven.mozilla.org/maven2/org/mozilla/components/feature-recentlyclo…
-280dfdf97bf1c9083e31549057131ed2c2301273b46e6b120631a91ea772f9fc | https://maven.mozilla.org/maven2/org/mozilla/components/feature-recentlyclo…
-585adfec4b1f6dcb6aa21dacf6079f7763b1ceca1146aea937b4b11345b93b2a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-search/91.0…
-858033651bb83ce20cd57d83f37b87c5df6528dc367467a3c5c0a822d34bfa0d | https://maven.mozilla.org/maven2/org/mozilla/components/feature-search/91.0…
-4cc4c498bb8fa3736fe435f63da6d24fbf2949ef7056defa8b15cd69f4d13cf5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-session/91.…
-bb708aa51fdf03b2ef378beb627209f94b18c5e087294fb5969a863441ce441d | https://maven.mozilla.org/maven2/org/mozilla/components/feature-session/91.…
-f250c8d64ff95a347b632a0c8363c2793331ad770a2b58b6dabe7ec6afa21e62 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-share/91.0.…
-19d05c5c3523735a153352633dc59abc115bc72dbb01a3add82689ab4d029309 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-share/91.0.…
-00c0af053ceaf2ea5cc4c2cabe33d92caa0ab4c96264007a3a67453093c6b5b8 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-sitepermiss…
-8d1365687c011fd33499341b3e74399b462af2fbab2a97a77b268afe82f61989 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-sitepermiss…
-3b134207a1c5e1f396fc52078b4844d17a42bb0981d699f0fce2c8f3b7fe204b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-syncedtabs/…
-9ae9c258df95abdf1dfbd057e96f400fa7c9da2e4b00f68c830fe1d04b82de5f | https://maven.mozilla.org/maven2/org/mozilla/components/feature-syncedtabs/…
-f22787438b9344803dedba558d72424ebe4f3514a31c1319581ada3fe6684bfe | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tab-collect…
-7c4af1f6f013ffddc7a4a5212ab43383696696e89bca77f9368ff073e6b6ac92 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tab-collect…
-dd1809baeb7879f4a2924f2c69650c0d04cd07bf5e53998807c9c4c4cc85fe38 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tabs/91.0.8…
-c103acd737ba517cbd294b3f3260311836893d6474737b68b6b35c567026ade5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tabs/91.0.8…
-23489ecb3aafaacf9d8b736aa29b8fd308e98391cef9fda5168aec8c3cd8bb69 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-toolbar/91.…
-343fcd414d848d81025c3164bf12be35385d57c7529f476b1af9d9f2afe7dd3b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-toolbar/91.…
-3ee5308508afd310680830ff2f8802f083e7b4ee11e4509c9afe0c57ec04652b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-top-sites/9…
-1ea310791191dc8fa40d6689c8fd549f074e250103a09c8ebbff288375a2ba13 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-top-sites/9…
-9efa30cbb1e478df9fc57a98dee94fd1a72243c632c7b50103322e408dde8c4b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webauthn/91…
-63c87c96d4634fbecdee4704302e6ec7402535aa023c23c2847a91d12b7a1933 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webauthn/91…
-3978cbef6e4b2d03bed6a47a18304230e049f3c5ed673ff3c45cb1a1ae58828a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat-r…
-78e99b47d0d01be34da67c277d7f62648cfa3f10928ffe193d919b4f730628e1 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat-r…
-7528f999749c9497e10b04c8231a98666371166a4f9468c8aa7940a2296e74b1 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat/9…
-a4797c00f4d556265a1a745ed88a89e164cab0d56f82d86672fbcbc56facd99a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat/9…
-be7500561ff6cee7edfb87eb7bd086dd39c7737f5eea87da0fd0fc8b892a5dfa | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webnotifica…
-44eccdbd7d2ed9a98bc19d7099b8441eb841dde5383cec7a7513cbb7897c635f | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webnotifica…
-e9f4d0ba90f412413a0c8d1eab5487155eb47634135f6b3d1379cce950cfac6f | https://maven.mozilla.org/maven2/org/mozilla/components/lib-crash/91.0.8/li…
-0d0e99bd26731e1eab61238bfbefe7303c0c01196ba932a86784b08d2399cbcf | https://maven.mozilla.org/maven2/org/mozilla/components/lib-crash/91.0.8/li…
-27f00608e031498c9aa611602671393beba723f775d766355715fa677145b56d | https://maven.mozilla.org/maven2/org/mozilla/components/lib-dataprotect/91.…
-a46a9d7ed9d86453693edb097dd9444dcb4ebcc78175a0cb39aa6533a5151ad6 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-dataprotect/91.…
-775e786e4396e29938c7a11827b4a172b3963d6ff31082d58ab648fade6973e6 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-publicsuffixlis…
-75dea3b92f3edfbe12d0eefe9e4d0fbff6204f97e64644a965df6ed977cf5450 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-publicsuffixlis…
-e06503bfc7bb96f1c6a4a1bc4a03381c4c29e0f4a398c7e16d3138e099cbab7c | https://maven.mozilla.org/maven2/org/mozilla/components/lib-push-firebase/9…
-00f47d6f767cd88512900b66b7f8d803739bfa77eae70774b2b7c19441b82d5c | https://maven.mozilla.org/maven2/org/mozilla/components/lib-push-firebase/9…
-5173d0d2c7f432a8967aefd5847c5566d6d80517b1e519e87662067159af7715 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-state/91.0.8/li…
-47a57aced7445553a976c8c14dd547f4e825cf45888ef925f24e0268546c3ce5 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-state/91.0.8/li…
-670b6032390b502f23d5f72848ad41e85e94abfe382e8540d0dedec9a01837fd | https://maven.mozilla.org/maven2/org/mozilla/components/service-digitalasse…
-bbe0578474b250f7c61717f8d1f771d9d03ddc3675cd222b6ab52b23e9ac5cb8 | https://maven.mozilla.org/maven2/org/mozilla/components/service-digitalasse…
-00565afd9a8fd9ad1cfd6393b0c136bcfd67f4c4adfac427e14fc3d1a5650bc3 | https://maven.mozilla.org/maven2/org/mozilla/components/service-firefox-acc…
-8650ecfa0a64298e832f1611ccfeca7771f8c2d202f901f854c811aa5bdaaa18 | https://maven.mozilla.org/maven2/org/mozilla/components/service-firefox-acc…
-634581afbb4c2c29c732d2610ef2761771d953c95bb4d4f18800bac9bd797f51 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/91.0.…
-e47e1db299946cba378c9e4dd382f8096dc36be2851d6c65cc3d11e8e4fbe604 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/91.0.…
-b88b6802fb72bdf21b040607ecb651b3467c698ea23320e9ae29fc59ffebd37a | https://maven.mozilla.org/maven2/org/mozilla/components/service-location/91…
-7e6fb40011acd9c6b1b81f6a47683922e6a7c6e9413a076d4eda565a8f1ff83e | https://maven.mozilla.org/maven2/org/mozilla/components/service-location/91…
-a9478d1e20c24b85afa47165a31acf1376c66492766bce837607c2816a17cd3d | https://maven.mozilla.org/maven2/org/mozilla/components/service-nimbus/91.0…
-c73b83d3c52eb9d98acc0d1a56f5580132d2f92d3492f35adaf79658637946bb | https://maven.mozilla.org/maven2/org/mozilla/components/service-nimbus/91.0…
-872f672b8a14a5ddc7c337b5fb0f77f7bfacc6e31783dc223e45e6113d18c063 | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-autofi…
-de4ea313eb978feb96cb0deb8a683ec403be232d7ae1a774a135590c24b26104 | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-autofi…
-dc0d8d59321eeff7678e635bb8dd0f0eb6aa1525b11cd1296dbf9fc549b84d37 | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-logins…
-fd5f2839eb7125521632f257010728cff9a1cf5216ed34d43cab342edef41279 | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-logins…
-91469ff86d2d2eeedbcfbade9f30612495181a463f1191e26c3368be8ca92db1 | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/91.0.8…
-ff2adf69b5559f1444e9b96da8d5882044fd472f935efce7d54fb3471e896c5d | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/91.0.8…
-6aad15f92c4c44bb0d2624c52058c3da78b8b30a1f39fa46afc4021b67787f26 | https://maven.mozilla.org/maven2/org/mozilla/components/support-images/91.0…
-635c1bdee69f8a6e30ff02d5e8969cc67a54154dd65d5db954faab32fe5a8595 | https://maven.mozilla.org/maven2/org/mozilla/components/support-images/91.0…
-db368e6b9bcc4427e0e063ccbc9f92d58cc0d944dc6e36467943153382350585 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/91.0.8/…
-4d75d1b0dfe3d48a15691b6c5664deb08ec0c8800ff4e5e45da093a3c0aaba4a | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/91.0.8/…
-5eddfda2e3c5a06f39c26ba137e6742e5fba3eba1ec1bf39647bf54ca9384776 | https://maven.mozilla.org/maven2/org/mozilla/components/support-locale/91.0…
-ab357e7316a6694099b32185a28bdb26fcdfda390a4480ef22f8c64ec02c96da | https://maven.mozilla.org/maven2/org/mozilla/components/support-locale/91.0…
-92f2afab982b4fb66fe5e7df14a542aa6e15108f8c5ae037ebcbf9c139bbda3f | https://maven.mozilla.org/maven2/org/mozilla/components/support-migration/9…
-07bfd938e9b2ce40fa9a42bb494d0d9ac9d6714660b186e693b1f54d1f904a7f | https://maven.mozilla.org/maven2/org/mozilla/components/support-migration/9…
-c9a04732c9a7e37f61284b5e5a917a33db63ad97fc8fc01a2d85abbf65a88a95 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rusthttp/91…
-7ce17c54de924caa2753e1f934ac23b73deaaa7b5916c6bb2f6cb83590ee6f74 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rusthttp/91…
-43f53d8b487ea9bf33caf3ef02c18a5dbd69c80f8648736eafe9c50b42a67fa0 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rustlog/91.…
-5066051e9ace2ca1d9dea8200db8445cc9d9bb19ee8185e83b3a2df113e50827 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rustlog/91.…
-039b429bb21f8d4ef8253ecde33877905eea5be304f4e29435594377de00d0d1 | https://maven.mozilla.org/maven2/org/mozilla/components/support-sync-teleme…
-e7de31243c555ee2748d4775bbe9c345d9411097c64d4a9a8d64503fe6ba9301 | https://maven.mozilla.org/maven2/org/mozilla/components/support-sync-teleme…
-f198d7a1cfc03b68c0235f08c3a45532ece0b0d605aeb19495240e85c00bd0d0 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test-libsta…
-c9a13869e7c19a91d863b9fd797a2a844f847f218d6e2747c2193eb306b0ab30 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test-libsta…
-acca5801e3c0870d31c9c63b18a79dcc0c6aa62874a31f3356d799bf2151157e | https://maven.mozilla.org/maven2/org/mozilla/components/support-test/91.0.8…
-812e2e42c5f6999868896c8cffd31e9ba16e20b0a19fda0053297935da9d9c02 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test/91.0.8…
-1c0d666cd9d3eca38dba4c49d940e2e501647aca0fd574bbc5e86bc6339427d4 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/91.0.…
-c57cdf228c6b9b7575411c02ed6fc29b3c8bc3b3f0ed1b550a923958e83f9bb5 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/91.0.…
-aef22bb7bab2c6aff0fc3f5b10e32bb82927297795cc9ce89ceff96ece089613 | https://maven.mozilla.org/maven2/org/mozilla/components/support-webextensio…
-ea08bed1e81dc56870c40b01850d998390b985920572846791aa8ec64b97c279 | https://maven.mozilla.org/maven2/org/mozilla/components/support-webextensio…
-c98361d8ac429d66ad73bfcf38f57f6f15f8db94714f0331336c90824271e319 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl…
-c7a9f1e59f60e14055bba3f31eb7e31ff23e2180ecbe3e0dc9765daf680de99e | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl…
-9109869a205fa6f2860829a3d3f3307b6a6de082434b8d2a36893465689c6ed6 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-autocomplete/91.…
-c8e0075c73fcedd14a935a11934792bb378b21fb2b3092d07193d6fcfefcb73f | https://maven.mozilla.org/maven2/org/mozilla/components/ui-autocomplete/91.…
-1bfa42c11b74627e77914af4d3344db3f8fe307790f8c1b1c1164bdca83b7e20 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-colors/91.0.8/ui…
-86e6bc830fb454ec098bd67763312974892279589803d764d121bb2f9c4714ee | https://maven.mozilla.org/maven2/org/mozilla/components/ui-colors/91.0.8/ui…
-9a3ab19bb90caccafac6662e40af820268bc066ebdd3eaadbf4959ea9b2fd012 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-icons/91.0.8/ui-…
-ac8212b9125712f2a61ac4791aaa9426aeb8c4637a25018847daaa0fb7ea6f0f | https://maven.mozilla.org/maven2/org/mozilla/components/ui-icons/91.0.8/ui-…
-99d5a462b8cde2ca8cebb0a19ea028f3c581d720efdf8e79aff01b13cc117677 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-tabcounter/91.0.…
-98a8b809cec978d3ecf435924dd1a670924b5b40098a5d8c47d0638b74fadd2c | https://maven.mozilla.org/maven2/org/mozilla/components/ui-tabcounter/91.0.…
-3e912259c0c9683db4c3ce99627ecb4cd5323c8dfe69e8db4ca0b9559b2a1bb6 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-widgets/91.0.8/u…
-aa8c0b3b03f6f4fe1be4490480b054261f498996def606100b2320a36e878d3b | https://maven.mozilla.org/maven2/org/mozilla/components/ui-widgets/91.0.8/u…
-b1f621caee72ebde401c5f483d730715c7263521a21270d8c5c147aacbead074 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/91.0.…
-894d04f6dbeb7c83b13a2794f41321f3d761d20a1bede4e2f8d1b61cd3b02213 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/91.0.…
+a814d9928d95924b3700be88e707f495d1c2a212616f70bee09116fd4fd353d9 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-awesomebar/…
+6d0608bb80dcb997fdbf486a47c8defb3f2fa631cd0b4eaa1806ca7a5b113bd1 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-awesomebar/…
+c404ac90f6d24d17099ed1bbee57057f11ddf012356da0132901c2fd56c4a48d | https://maven.mozilla.org/maven2/org/mozilla/components/browser-domains/91.…
+044cf3127eb2696be1a66703848993e699b5a34d65cbbc9819b800127792ae9d | https://maven.mozilla.org/maven2/org/mozilla/components/browser-domains/91.…
+295df439aa1daf63bc8be88e29bc8dde8b94857262fe7cd14c4a950997186bf8 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck…
+282d243812a39da7a17ea6b2f5f1b5aebac23ac6a8cb09f97b69dbbb9efe1e5b | https://maven.mozilla.org/maven2/org/mozilla/components/browser-engine-geck…
+8a2be07551135b93243842c07c75b0a5af165721a79c38e5b50c818cc905aac8 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-errorpages/…
+94a3a337b1ba8df1da8718e410186df49e00632ba3baa8161a26e7227ad8525e | https://maven.mozilla.org/maven2/org/mozilla/components/browser-errorpages/…
+11720640dc5a1ff672eaa4edd94f359ce4a32b1f54f564d66369cc78248531fe | https://maven.mozilla.org/maven2/org/mozilla/components/browser-icons/91.0.…
+f5355130bdb5bf9d0881bd4237887a598b1a30996f1f57cbd96db5b301222a60 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-icons/91.0.…
+1ea5a019d2686e9729e06f76f9ba1fc575498bb6e466cb68fa4e42fe6afa925e | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu/91.0.1…
+b415e8f3d1ecf1ef164a37761769dc5cf3e2f2225a62e68dcee4ed43b62969b9 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu/91.0.1…
+70613303a83d53bf33436ed9a58b8192f390edd2c4cb556aceabae29a0d8bba5 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu2/91.0.…
+d04f49b3560d08cd07bc03706c9772d76c9e496f8e3202de4396bd6180ed998c | https://maven.mozilla.org/maven2/org/mozilla/components/browser-menu2/91.0.…
+3034158a1d3a769270f8ab50035af0795b6510c8532da6884d53c34498785ac1 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session-sto…
+e581e619a88bf5e130c8cdf1dd5d45d25aa7c6cbb80e2a66d49774516781406c | https://maven.mozilla.org/maven2/org/mozilla/components/browser-session-sto…
+8fea4886875596d042c88615c61fdea5c57f2a1c354976aa3c91aa5c7cdc727d | https://maven.mozilla.org/maven2/org/mozilla/components/browser-state/91.0.…
+b828570c222d2b9b3755e7fc2b148f553db909c081fcc319e9c5ce2d28cde7be | https://maven.mozilla.org/maven2/org/mozilla/components/browser-state/91.0.…
+f36a7cc51f0157c7446a9345f9b2d8db1416ee6403ef54fefe7646bdce04117f | https://maven.mozilla.org/maven2/org/mozilla/components/browser-storage-syn…
+3b4f1e2c08e1c226dd9d4c371e2606be9bce43ee7547134672e90faea4f476c3 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-storage-syn…
+e07cf87814d2cbfc068158d6ee4978497e324da2f0f0332e24846627cbab0b7f | https://maven.mozilla.org/maven2/org/mozilla/components/browser-tabstray/91…
+a648e8dd16b4449534c96596985bbf55fa73272b1aeaee2d23d7b6ed23cdc4ce | https://maven.mozilla.org/maven2/org/mozilla/components/browser-tabstray/91…
+260fcdb293b89022d9900be100082fb98af7a19c63e3e55ae38ff472cbbf67f1 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-thumbnails/…
+5054070e5d7fea1dd5680c22da99f11cd224614120f56294005216a8a39ea385 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-thumbnails/…
+4b361aa290d713dc1278e00c0b0d93b911a6732ab14da6499d97a276fd81fa9e | https://maven.mozilla.org/maven2/org/mozilla/components/browser-toolbar/91.…
+5ed78b66d29bf8823290eb574375a0fdf59b56a30bbdb86445fb9eb298bdb5c2 | https://maven.mozilla.org/maven2/org/mozilla/components/browser-toolbar/91.…
+81047fa9360260b9d0b806553f32dacff7690d97166b6c3be74f8d2e4e996384 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-awesomebar/…
+4157643bd91eab7eaadb6ee24501beb5899dbaf964502a4bbbfb69128e757556 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-awesomebar/…
+bf2d79aed83ac11c3e455b68551dbc6275dbcd0460602a34bbcd19ba34a500da | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/91.0.1…
+ce21fa255eb7c072b508df0c84c7066e5347d9261f7bdca12e5f2bf2d1a24fa1 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-base/91.0.1…
+475a72e6d0cc7f15502c9d370f3f3187b07a32f5ccfabe377898ad5a7dfd07d5 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-engine/91.0…
+3eeb00ce16358224ed9885be91c6422385a282b36cb03fb255c21198e9bb623e | https://maven.mozilla.org/maven2/org/mozilla/components/concept-engine/91.0…
+8d276c46f99147567eefaa674c48a26f76760ebf14159037ee728852813c5d73 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/91.0.…
+15c1a9ef13e96c98b5d74cdbf8f5e0bf38e0a19f1c68aa406b17f8231d7b4592 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-fetch/91.0.…
+5679dd6cd9ed24bbcddc9ac3dc32a82926cb0408b07c718c7f15ae079d22b63f | https://maven.mozilla.org/maven2/org/mozilla/components/concept-menu/91.0.1…
+97843f40c4e3c01c5e3dfb54249740446fa7278e80c270319f76c9d82efc17cc | https://maven.mozilla.org/maven2/org/mozilla/components/concept-menu/91.0.1…
+757e2fce90de1ad74d65b30376180778e1b19c6c5d97e99305d71095f25c9bea | https://maven.mozilla.org/maven2/org/mozilla/components/concept-push/91.0.1…
+c3d398eacb0b2cc13548e06d90fe0e62713f1b9662549554409f9f94959c064a | https://maven.mozilla.org/maven2/org/mozilla/components/concept-push/91.0.1…
+63b7dbd7864d24ae382ca2a7911065be8ed83976ba096988546f241cdea1a2e8 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-storage/91.…
+5282c1352edf8b6f8ff741c9e3cf450372d94862b9103c4869e4dc5d48cb96da | https://maven.mozilla.org/maven2/org/mozilla/components/concept-storage/91.…
+c63e0062d1af04dcbe547710041733af6b923e8fac9cb282d9350f4fe7e9a946 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-sync/91.0.1…
+e80c627727b8cf92a612234036115035bae463e6ca3fca8738283292b668e841 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-sync/91.0.1…
+53a41d47d084a2f2d165dc505867daa04ae140d0c19941a1c0c824fbdf623e38 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-tabstray/91…
+a1feac5049865001dcaa36d68a8f12e7bf5e707827db50ce73db1b3df1e4ef53 | https://maven.mozilla.org/maven2/org/mozilla/components/concept-tabstray/91…
+b82626b31042cbb6e66adf53a391c9e1bdea490a4305093ca79b47324d6ec8af | https://maven.mozilla.org/maven2/org/mozilla/components/concept-toolbar/91.…
+48cb5ea39365b91f973048dab8fa0afdaafd754d9cfd5cbe0f7d7738c466db5f | https://maven.mozilla.org/maven2/org/mozilla/components/concept-toolbar/91.…
+90b252b349accfddc506fb8d6e7398176eab0d9f2735ee5f3a654af7ad8e563a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts-pu…
+adcb572ef26dd896c41b57107487e1d12d28b068be7856fe17ed21b2f44390ec | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts-pu…
+aaf6046ffd41e86bd7b804416c23745abad680547c4016ffb456435e3bdbaf80 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts/91…
+422ff02140aa6dc2642f6a7082932216fc166636c7484e74e1cad5c4bef0d73b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-accounts/91…
+1a5e9a3e3e86e4dd85fc2d80490c2e3218895dbe2442a347cc92e8654986fe72 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-addons/91.0…
+852c62b0785cb93f6417549a91c94f2a8757d266278444b858a3e8d6688eb236 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-addons/91.0…
+1ceb54b52b72356482a700325389561d99a5eb408527592ddd052819ddccf8f6 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-app-links/9…
+40d203ba67bdd0bcd094b257ef410986a1c71e4948d84dbc71f27d3c2ef6fe37 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-app-links/9…
+17a7ddfd71a4742b040db866251b43fefe27b38c607f46185e7af4247d82c73d | https://maven.mozilla.org/maven2/org/mozilla/components/feature-autofill/91…
+5da869ff0ede4c9ee9e92ca52d352d0fd3fe4f3aa2bea7519ca7a68bd72d04ee | https://maven.mozilla.org/maven2/org/mozilla/components/feature-autofill/91…
+b2ee0f7631138a7ffa5fc4801d202be7369a705e5115cd69a66c57e12635f662 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-awesomebar/…
+60301c7e653f6bcb95b7b2e009bfc21895128c2c8e7d5f460ccefdcc4b2497f6 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-awesomebar/…
+1f9bc93b0d01da1d12da43eb6055080ff3fd104f898eaeaa922a03d4b312f71c | https://maven.mozilla.org/maven2/org/mozilla/components/feature-contextmenu…
+56962842bb222c2fefe02f80841143363d0ada96a6780dfc81f2b0c64cf70ffb | https://maven.mozilla.org/maven2/org/mozilla/components/feature-contextmenu…
+2a12bf6f70a8cb8820207920a54992a2530de27ff27230be50eea7c391285761 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-customtabs/…
+5347788c8ec45fc5a4073dc502129f1b5ae152d23659c2fcbe656f4014ec3cd0 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-customtabs/…
+37ca8d5e188626f77d17fa5a12b1e0722b2a41e4782e0b065e38cc9efdce78d7 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-downloads/9…
+299be40a073134a26e5169a5aa51d6a481c8f88a92f7a92e379c9bb0769b725e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-downloads/9…
+e24b2af5afebef58f4f6405ac36e0b80ffa3c076cee5b657aa95f46d0f8da837 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-findinpage/…
+e693940ccf94179bc79ab89e9aef23ca6b67fdff8a219ac8579d3a26bcc205ba | https://maven.mozilla.org/maven2/org/mozilla/components/feature-findinpage/…
+15dad56af1e701b16bc6e71f00a936ce8ffe566692cc6ee973be03123935d0e5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-intent/91.0…
+230d40736fd93167166d83fba2e0ba6b284d348e8e2c63ebd983a1a1a9e971f9 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-intent/91.0…
+3c99177229ee0872a31b0952e29db6dd808b46be3a5d3f9629c4c398d77691c5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-logins/91.0…
+2ef7541bef29b6d515d1913c2b0bb0af4166d08854d4fb1745b8d027705e8a38 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-logins/91.0…
+946c6caaf460c14554e74f07fc8dbea378f6c583f9f948ff23706224675b92ec | https://maven.mozilla.org/maven2/org/mozilla/components/feature-media/91.0.…
+436239c4924d1f2bfaa284050c85e043e3444e7ecf649b2ab24991544ce54eb1 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-media/91.0.…
+4e5de4c5976705d9076819a87ac6a077653511e7a0e8298baeef49e4719181ac | https://maven.mozilla.org/maven2/org/mozilla/components/feature-privatemode…
+9e8bfbef3030f609885dcb7bd40eabe04b1de378bd4ca48600c0a6d7e62fe42a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-privatemode…
+384e59bc50ab453d3f592603045f69afa7fea75649c064676a8f8f3426c33a54 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-prompts/91.…
+a375c3750a9e28c085d7ec5479ebcf0896bb21e2406a45830f2a8316e963774d | https://maven.mozilla.org/maven2/org/mozilla/components/feature-prompts/91.…
+bbe3587d9da82fab10b905d22ad0b5be94eb698aeb0e537d172bd3a4c25222b0 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-push/91.0.1…
+c2b10a77580fdf2e81bec1528b2ae8013556ba28f23f1d319f7defbbc3997f4d | https://maven.mozilla.org/maven2/org/mozilla/components/feature-push/91.0.1…
+78208664191900c7d31d626b8070e56a377e69f99e91a2f2bfae02c0f771fa56 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-pwa/91.0.12…
+f3850c8eddaaa2ecebbe8f0e316fb89ab2922c8b4a0438e8513858f654dd0412 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-pwa/91.0.12…
+39be855565595b03087350ca0c4728d9c79b14b00572bfd217fd899235e1afcc | https://maven.mozilla.org/maven2/org/mozilla/components/feature-qr/91.0.12/…
+c55b557cf27c62fa2f420eb90eaadab2a06e8d594a8d2db22a64284f51242e5e | https://maven.mozilla.org/maven2/org/mozilla/components/feature-qr/91.0.12/…
+5205bc082586477baae7d68d3d1dd582e89bbb467ab3cbe02363228e460439a9 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-readerview/…
+e46920072b8ecea19fde6742f16c9e897fa6a01eb34bb262ddecbdcfc5297336 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-readerview/…
+62a8cb67977e6b7cecb9ae59ff628ee721b4ca228be2304eddb8425f17d70cbf | https://maven.mozilla.org/maven2/org/mozilla/components/feature-recentlyclo…
+dd7e87097954e673ca991a1adbfa7e03d962885c6606705ca59cfaed3818c68b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-recentlyclo…
+585adfec4b1f6dcb6aa21dacf6079f7763b1ceca1146aea937b4b11345b93b2a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-search/91.0…
+7da813d61fb4544a5f58de912a00654e5a8cb48520102e043f9fa2bacc215366 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-search/91.0…
+4cc4c498bb8fa3736fe435f63da6d24fbf2949ef7056defa8b15cd69f4d13cf5 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-session/91.…
+475e501c07592daac9a6a694b66fda6fed9dc720ec880664dbddce8a250b24db | https://maven.mozilla.org/maven2/org/mozilla/components/feature-session/91.…
+f250c8d64ff95a347b632a0c8363c2793331ad770a2b58b6dabe7ec6afa21e62 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-share/91.0.…
+986cac9e09caa58a9703ec20cacdb1f9dae96db28795c49f1bdedc9ecba74eda | https://maven.mozilla.org/maven2/org/mozilla/components/feature-share/91.0.…
+00c0af053ceaf2ea5cc4c2cabe33d92caa0ab4c96264007a3a67453093c6b5b8 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-sitepermiss…
+38d64a7b3be1c96c69f50f26091c649dcc452a9a67fde9cc200bb4890c3ea77d | https://maven.mozilla.org/maven2/org/mozilla/components/feature-sitepermiss…
+3b134207a1c5e1f396fc52078b4844d17a42bb0981d699f0fce2c8f3b7fe204b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-syncedtabs/…
+ad2c6e50956c7b94aa48fde57e59c082403f9fed2b68bac6c7210b532d289a5b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-syncedtabs/…
+f22787438b9344803dedba558d72424ebe4f3514a31c1319581ada3fe6684bfe | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tab-collect…
+c3ef39707714c5b28e659a24bdbad18affc357d27344ecd69f917dfc6be362a2 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tab-collect…
+dd1809baeb7879f4a2924f2c69650c0d04cd07bf5e53998807c9c4c4cc85fe38 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tabs/91.0.1…
+54e40be545fa041162d68843adca100b856943980a1525a3e0990ac4efc23194 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-tabs/91.0.1…
+23489ecb3aafaacf9d8b736aa29b8fd308e98391cef9fda5168aec8c3cd8bb69 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-toolbar/91.…
+b53cf073b8ef02ab50130f2c7159d978eb9ac843a3314cbc0313d3f25a50a929 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-toolbar/91.…
+3ee5308508afd310680830ff2f8802f083e7b4ee11e4509c9afe0c57ec04652b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-top-sites/9…
+db175fa4254791cbec0d73c649c60a4387551585b0ac747783389d9c6ba13705 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-top-sites/9…
+9efa30cbb1e478df9fc57a98dee94fd1a72243c632c7b50103322e408dde8c4b | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webauthn/91…
+a93d1dbc5cc1ba3faf05ef1ff60f6092aec73593f14d8a7054f306a23e3868a4 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webauthn/91…
+3978cbef6e4b2d03bed6a47a18304230e049f3c5ed673ff3c45cb1a1ae58828a | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat-r…
+7a256d37c74733fe9df4e19bcd7d314fff104e87836724e822d72adc18d847a2 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat-r…
+7528f999749c9497e10b04c8231a98666371166a4f9468c8aa7940a2296e74b1 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat/9…
+9a46327e16deab0664def808c959c48f88bdc4ae51a822fe3bd9b39532ae9b18 | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webcompat/9…
+be7500561ff6cee7edfb87eb7bd086dd39c7737f5eea87da0fd0fc8b892a5dfa | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webnotifica…
+ca8943d88db7bfce9bd3e7dcd1645706d53037a80cddeb58a0aa22c9a0123baa | https://maven.mozilla.org/maven2/org/mozilla/components/feature-webnotifica…
+f4965ce878db9ce5e2488fabd019e1de5f33dbadc29012737f602f011d4d7994 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-crash/91.0.12/l…
+929edde5aa26e7b658b70ae3d3dff23679d1d388d52ac6815cf37708bdf76204 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-crash/91.0.12/l…
+27f00608e031498c9aa611602671393beba723f775d766355715fa677145b56d | https://maven.mozilla.org/maven2/org/mozilla/components/lib-dataprotect/91.…
+babc63c26a143e5948c3012d2a08f5505a178dd6722452a126378bcba1a2db45 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-dataprotect/91.…
+775e786e4396e29938c7a11827b4a172b3963d6ff31082d58ab648fade6973e6 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-publicsuffixlis…
+62e41a97f833fbc70a59f860358d742367d05bc48ce780f9fc034ca47ed971c0 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-publicsuffixlis…
+e06503bfc7bb96f1c6a4a1bc4a03381c4c29e0f4a398c7e16d3138e099cbab7c | https://maven.mozilla.org/maven2/org/mozilla/components/lib-push-firebase/9…
+9be972db582feb56d2f70d22872b36a215fa2afc2023297e4c8dc6dcd20f6cd9 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-push-firebase/9…
+5173d0d2c7f432a8967aefd5847c5566d6d80517b1e519e87662067159af7715 | https://maven.mozilla.org/maven2/org/mozilla/components/lib-state/91.0.12/l…
+f1c1915500327a991b77f5fadd1f2883d5266effcdfd3b25ea4c7cd735a71cee | https://maven.mozilla.org/maven2/org/mozilla/components/lib-state/91.0.12/l…
+670b6032390b502f23d5f72848ad41e85e94abfe382e8540d0dedec9a01837fd | https://maven.mozilla.org/maven2/org/mozilla/components/service-digitalasse…
+5a30506b2696b02394f7263ba17e22ad18e6c8577599f1928cd25dbf6c488cd3 | https://maven.mozilla.org/maven2/org/mozilla/components/service-digitalasse…
+00565afd9a8fd9ad1cfd6393b0c136bcfd67f4c4adfac427e14fc3d1a5650bc3 | https://maven.mozilla.org/maven2/org/mozilla/components/service-firefox-acc…
+088113c22bc7d13494b8d4fa893953eb246ca64ffc65fbafcfcf702f70c7e007 | https://maven.mozilla.org/maven2/org/mozilla/components/service-firefox-acc…
+634581afbb4c2c29c732d2610ef2761771d953c95bb4d4f18800bac9bd797f51 | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/91.0.…
+fcc6f5c3bc8608a99c6fc56cd6384f3232361f75ea7233e3263e270d41da5f9a | https://maven.mozilla.org/maven2/org/mozilla/components/service-glean/91.0.…
+69014ac03301d51b118a0bbd737ba2dd872ea17dcff7c1c5e2ce2f77e5a8b146 | https://maven.mozilla.org/maven2/org/mozilla/components/service-location/91…
+9631915f641d0dd93740183235897bca72a02fac22860f0a973a60d4f8b36654 | https://maven.mozilla.org/maven2/org/mozilla/components/service-location/91…
+a9478d1e20c24b85afa47165a31acf1376c66492766bce837607c2816a17cd3d | https://maven.mozilla.org/maven2/org/mozilla/components/service-nimbus/91.0…
+ef6709228bb6ce168f6b1de1b408a16c131b99699b44d28f0987d9b68d9efa18 | https://maven.mozilla.org/maven2/org/mozilla/components/service-nimbus/91.0…
+872f672b8a14a5ddc7c337b5fb0f77f7bfacc6e31783dc223e45e6113d18c063 | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-autofi…
+425c4594074f98e036941384464e05701c823768f965c1a544f2530c5facc43d | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-autofi…
+dc0d8d59321eeff7678e635bb8dd0f0eb6aa1525b11cd1296dbf9fc549b84d37 | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-logins…
+74090af19f175ede07c23925eae1a13232f5bac6419984b6e8d11e745ade8fd9 | https://maven.mozilla.org/maven2/org/mozilla/components/service-sync-logins…
+c0ee4b7932e6645b091f0a9e6dcbe46aeb7e72bbcd4982c57577176722ce04cc | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/91.0.1…
+71a3aae0b4461969c3d09330ae1294f8c23bc5dc6fa50b3cc500026a06d09f5b | https://maven.mozilla.org/maven2/org/mozilla/components/support-base/91.0.1…
+6aad15f92c4c44bb0d2624c52058c3da78b8b30a1f39fa46afc4021b67787f26 | https://maven.mozilla.org/maven2/org/mozilla/components/support-images/91.0…
+e7223a363708069756de1571209004dd2a67362325de9a242048222deef01328 | https://maven.mozilla.org/maven2/org/mozilla/components/support-images/91.0…
+db368e6b9bcc4427e0e063ccbc9f92d58cc0d944dc6e36467943153382350585 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/91.0.12…
+4590eb6eac7a2a1fc98e86c6111bc21658a5b4b4e2b87ff9a5521fd0d8ee04b3 | https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/91.0.12…
+5eddfda2e3c5a06f39c26ba137e6742e5fba3eba1ec1bf39647bf54ca9384776 | https://maven.mozilla.org/maven2/org/mozilla/components/support-locale/91.0…
+225114e233df2ce85b0cf897bfed2282d99b35da455be67855dcdfb4e914822e | https://maven.mozilla.org/maven2/org/mozilla/components/support-locale/91.0…
+92f2afab982b4fb66fe5e7df14a542aa6e15108f8c5ae037ebcbf9c139bbda3f | https://maven.mozilla.org/maven2/org/mozilla/components/support-migration/9…
+f409b22aa46601aeb25f691498df42ebbd82e8842a19fd695794ff2109b51ecd | https://maven.mozilla.org/maven2/org/mozilla/components/support-migration/9…
+c9a04732c9a7e37f61284b5e5a917a33db63ad97fc8fc01a2d85abbf65a88a95 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rusthttp/91…
+89f1b908e78a024cd670e1a86aa830a0e788c2bbf399858cbbb263f60e42b8e4 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rusthttp/91…
+43f53d8b487ea9bf33caf3ef02c18a5dbd69c80f8648736eafe9c50b42a67fa0 | https://maven.mozilla.org/maven2/org/mozilla/components/support-rustlog/91.…
+0e94799bbfff6d92d8db31354d23e7aaddfd425f9a97f7aa11b0afd8dd88bcef | https://maven.mozilla.org/maven2/org/mozilla/components/support-rustlog/91.…
+039b429bb21f8d4ef8253ecde33877905eea5be304f4e29435594377de00d0d1 | https://maven.mozilla.org/maven2/org/mozilla/components/support-sync-teleme…
+cafc4b78f8f639a854f6480534711b28d3ee62c4d565cbf84b87702ad1c5a11f | https://maven.mozilla.org/maven2/org/mozilla/components/support-sync-teleme…
+f198d7a1cfc03b68c0235f08c3a45532ece0b0d605aeb19495240e85c00bd0d0 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test-libsta…
+0480c5f837846db7688bf7f2cfd85b4fccd53409c3c8dd95efeff2972509fcf8 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test-libsta…
+acca5801e3c0870d31c9c63b18a79dcc0c6aa62874a31f3356d799bf2151157e | https://maven.mozilla.org/maven2/org/mozilla/components/support-test/91.0.1…
+06fa64f88cd615038d77421325c3e991cd5bbc9ca2416e83a5d83cbaa6934dc1 | https://maven.mozilla.org/maven2/org/mozilla/components/support-test/91.0.1…
+1c0d666cd9d3eca38dba4c49d940e2e501647aca0fd574bbc5e86bc6339427d4 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/91.0.…
+51103e10f78dba2e926462f42901c3f76b9457d8b5767eee4b1e3c643d43ebd3 | https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/91.0.…
+aef22bb7bab2c6aff0fc3f5b10e32bb82927297795cc9ce89ceff96ece089613 | https://maven.mozilla.org/maven2/org/mozilla/components/support-webextensio…
+cf4b22c10f44dfc65d5c428be756662190507e8e6014e110007ad08d9b79169d | https://maven.mozilla.org/maven2/org/mozilla/components/support-webextensio…
+803c56f8d6b8dc8cf337b0f41d11ebf99c773c210a27208306feab3d0416d318 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl…
+847e0d37798a3cb879f859f1b2762c5ec82f1b46a6c25bdee5437586d175f802 | https://maven.mozilla.org/maven2/org/mozilla/components/tooling-glean-gradl…
+9109869a205fa6f2860829a3d3f3307b6a6de082434b8d2a36893465689c6ed6 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-autocomplete/91.…
+76b9a255b034c30f54f95b0e53e1b21267c2b0c46844f0c15415ba0670522b76 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-autocomplete/91.…
+1bfa42c11b74627e77914af4d3344db3f8fe307790f8c1b1c1164bdca83b7e20 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-colors/91.0.12/u…
+6b7a0b424bcd31ce47430ec7b3c543bccc659a46fef4d4916e7fac4dd4ce5e5f | https://maven.mozilla.org/maven2/org/mozilla/components/ui-colors/91.0.12/u…
+9a3ab19bb90caccafac6662e40af820268bc066ebdd3eaadbf4959ea9b2fd012 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-icons/91.0.12/ui…
+4e0f0b6091408a44f8efee33984ea9dd8111cf1e1527e3a57677eec1fadd2ad0 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-icons/91.0.12/ui…
+99d5a462b8cde2ca8cebb0a19ea028f3c581d720efdf8e79aff01b13cc117677 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-tabcounter/91.0.…
+ead4639957a808ad023c52d08575a2e1cc22d0f4915e8fcc9a7fa6a2fdc96dce | https://maven.mozilla.org/maven2/org/mozilla/components/ui-tabcounter/91.0.…
+3e912259c0c9683db4c3ce99627ecb4cd5323c8dfe69e8db4ca0b9559b2a1bb6 | https://maven.mozilla.org/maven2/org/mozilla/components/ui-widgets/91.0.12/…
+f2b3ae340b2535286a1ae1a1b2ce9d6e0185b976d227b4f0bbbf716b3ab0286a | https://maven.mozilla.org/maven2/org/mozilla/components/ui-widgets/91.0.12/…
+2f7ac2fa7e9920d8c4db072f79c0e829237e3624f350771d998399348e0604cb | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/91.0.20210…
+c6b0eb0a6a703d7133d729b602807ebe0e1ffbabd2335497265d82aea4f03696 | https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/91.0.20210…
6424962ef4d9fe24d89e7d515db6fe0eef5ce6b57872a1765c9d8bc1a0fd7965 | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3…
5b75897df59e9710ce53e4e7535a4bfba5949b9d59cb4d2c1603e901b78bb41d | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/3…
4998a4e21f13260447b2279deba3173da1ee7c0088e04f123242c235d0f7afed | https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/…
diff --git a/projects/firefox/config b/projects/firefox/config
index 1b98216..7936e09 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,14 +1,14 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1'
tag_gpg_id: 1
git_url: https://git.torproject.org/tor-browser.git
git_submodule: 1
gpg_keyring: torbutton.gpg
var:
- firefox_platform_version: 78.12.0
+ firefox_platform_version: 78.13.0
firefox_version: '[% c("var/firefox_platform_version") %]esr'
torbrowser_branch: 11.0
branding_directory: 'browser/branding/alpha'
diff --git a/projects/geckoview/config b/projects/geckoview/config
index 0d17017..400d9d3 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -8,7 +8,7 @@ git_submodule: 1
gpg_keyring: torbutton.gpg
var:
- geckoview_version: 91.0b5
+ geckoview_version: 91.0
torbrowser_branch: 11.0
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
deps:
diff --git a/projects/go/config b/projects/go/config
index 79f24a2..47ae988 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-version: 1.16.6
+version: 1.16.7
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
var:
@@ -118,7 +118,7 @@ input_files:
enable: '[% ! c("var/linux") %]'
- URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
name: go
- sha256sum: a3a5d4bc401b51db065e4f93b523347a4d343ae0c0b08a65c3423b05a138037d
+ sha256sum: 1a9f2894d3d878729f7045072f30becebe243524cf2fce4e0a7b248b1e0654ac
- URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz'
name: go14
sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 6ef2953..ae60982 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,19 @@
+Tor Browser 11.0a4 -- August 11 2021
+ * All Platforms
+ * Windows + OS X + Linux
+ * Update Firefox to 78.13.0esr
+ * Bug 40041: Remove V2 Deprecation banner on about:tor for desktop [torbutton]
+ * Bug 40534: Cannot open URLs on command line with Tor Browser 10.5 [tor-browser]
+ * Bug 40547: UX: starting in offline mode can result in difficulty to connect later [tor-browser]
+ * Bug 40561: Refactor about:torconnect implementation [tor-browser]
+ * Bug 40567: RFPHelper is not init until after about:torconnect bootstraps [tor-browser]
+ * Android
+ * Update Fenix to 91.1.0
+ * Bug 40186: Hide Credit Cards in Settings [fenix]
+ * Build System
+ * All Platforms
+ * Update Go to 1.16.7
+
Tor Browser 11.0a3 -- August 5 2021
* Android
* Update NoScript to 11.2.11
diff --git a/rbm.conf b/rbm.conf
index 303217e..997a196 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -57,10 +57,10 @@ buildconf:
git_signtag_opt: '-s'
var:
- torbrowser_version: '11.0a3'
+ torbrowser_version: '11.0a4'
torbrowser_build: 'build1'
torbrowser_incremental_from:
- - 10.5a17
+ - 11.0a3
project_name: tor-browser
multi_lingual: 0
build_mar: 1
1
0
[tor-browser/tor-browser-91.0-11.0-1] Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by boklm＠torproject.org 10 Aug '21
by boklm＠torproject.org 10 Aug '21
10 Aug '21
commit d702b660b5b5b6f1483f1d147ac819ebc0c6e8be
Author: Richard Pospesel <richard(a)torproject.org>
Date: Mon Sep 16 15:25:39 2019 -0700
Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
This patch adds a new about:preferences#tor page which allows modifying
bridge, proxy, and firewall settings from within Tor Browser. All of the
functionality present in tor-launcher's Network Configuration panel is
present:
- Setting built-in bridges
- Requesting bridges from BridgeDB via moat
- Using user-provided bridges
- Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies
- Setting firewall ports
- Viewing and Copying Tor's logs
- The Networking Settings in General preferences has been removed
---
browser/components/moz.build | 1 +
browser/components/preferences/main.inc.xhtml | 54 --
browser/components/preferences/main.js | 14 -
browser/components/preferences/preferences.js | 9 +
browser/components/preferences/preferences.xhtml | 5 +
browser/components/preferences/privacy.js | 1 +
.../torpreferences/content/parseFunctions.jsm | 89 +++
.../torpreferences/content/requestBridgeDialog.jsm | 204 +++++
.../content/requestBridgeDialog.xhtml | 35 +
.../torpreferences/content/torBridgeSettings.jsm | 325 ++++++++
.../torpreferences/content/torCategory.inc.xhtml | 9 +
.../torpreferences/content/torFirewallSettings.jsm | 72 ++
.../torpreferences/content/torLogDialog.jsm | 66 ++
.../torpreferences/content/torLogDialog.xhtml | 23 +
.../components/torpreferences/content/torPane.js | 857 +++++++++++++++++++++
.../torpreferences/content/torPane.xhtml | 123 +++
.../torpreferences/content/torPreferences.css | 77 ++
.../torpreferences/content/torPreferencesIcon.svg | 5 +
.../torpreferences/content/torProxySettings.jsm | 245 ++++++
browser/components/torpreferences/jar.mn | 14 +
browser/components/torpreferences/moz.build | 1 +
browser/modules/BridgeDB.jsm | 110 +++
browser/modules/TorProtocolService.jsm | 212 +++++
browser/modules/moz.build | 2 +
24 files changed, 2485 insertions(+), 68 deletions(-)
diff --git a/browser/components/moz.build b/browser/components/moz.build
index 57ec3c51c5e9..b409974a965c 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -54,6 +54,7 @@ DIRS += [
"syncedtabs",
"uitour",
"urlbar",
+ "torpreferences",
"translation",
]
diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
index a89b89f723a8..594711e61474 100644
--- a/browser/components/preferences/main.inc.xhtml
+++ b/browser/components/preferences/main.inc.xhtml
@@ -671,58 +671,4 @@
<label id="cfrFeaturesLearnMore" class="learnMore" data-l10n-id="browsing-cfr-recommendations-learn-more" is="text-link"/>
</hbox>
</groupbox>
-
-<hbox id="networkProxyCategory"
- class="subcategory"
- hidden="true"
- data-category="paneGeneral">
- <html:h1 data-l10n-id="network-settings-title"/>
-</hbox>
-
-<!-- Network Settings-->
-<groupbox id="connectionGroup" data-category="paneGeneral" hidden="true">
- <label class="search-header" hidden="true"><html:h2 data-l10n-id="network-settings-title"/></label>
-
- <hbox align="center">
- <hbox align="center" flex="1">
- <description id="connectionSettingsDescription" control="connectionSettings"/>
- <spacer width="5"/>
- <label id="connectionSettingsLearnMore" class="learnMore" is="text-link"
- data-l10n-id="network-proxy-connection-learn-more">
- </label>
- <separator orient="vertical"/>
- </hbox>
-
- <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
- <hbox>
- <button id="connectionSettings"
- is="highlightable-button"
- class="accessory-button"
- data-l10n-id="network-proxy-connection-settings"
- searchkeywords="doh trr"
- search-l10n-ids="
- connection-window.title,
- connection-proxy-option-no.label,
- connection-proxy-option-auto.label,
- connection-proxy-option-system.label,
- connection-proxy-option-manual.label,
- connection-proxy-http,
- connection-proxy-https,
- connection-proxy-http-port,
- connection-proxy-socks,
- connection-proxy-socks4,
- connection-proxy-socks5,
- connection-proxy-noproxy,
- connection-proxy-noproxy-desc,
- connection-proxy-https-sharing.label,
- connection-proxy-autotype.label,
- connection-proxy-reload.label,
- connection-proxy-autologin.label,
- connection-proxy-socks-remote-dns.label,
- connection-dns-over-https.label,
- connection-dns-over-https-url-custom.label,
- " />
- </hbox>
- </hbox>
-</groupbox>
</html:template>
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
index 2a6ba4a3d8e4..501ba9144a31 100644
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
@@ -368,15 +368,6 @@ var gMainPane = {
});
this.updatePerformanceSettingsBox({ duringChangeEvent: false });
this.displayUseSystemLocale();
- let connectionSettingsLink = document.getElementById(
- "connectionSettingsLearnMore"
- );
- let connectionSettingsUrl =
- Services.urlFormatter.formatURLPref("app.support.baseURL") +
- "prefs-connection-settings";
- connectionSettingsLink.setAttribute("href", connectionSettingsUrl);
- this.updateProxySettingsUI();
- initializeProxyUI(gMainPane);
if (Services.prefs.getBoolPref("intl.multilingual.enabled")) {
gMainPane.initBrowserLocale();
@@ -510,11 +501,6 @@ var gMainPane = {
"change",
gMainPane.updateHardwareAcceleration.bind(gMainPane)
);
- setEventListener(
- "connectionSettings",
- "command",
- gMainPane.showConnections
- );
setEventListener(
"browserContainersCheckbox",
"command",
diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
index 91e9e469cea2..a89fddd0306d 100644
--- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js
@@ -13,6 +13,7 @@
/* import-globals-from findInPage.js */
/* import-globals-from ../../base/content/utilityOverlay.js */
/* import-globals-from ../../../toolkit/content/preferencesBindings.js */
+/* import-globals-from ../torpreferences/content/torPane.js */
"use strict";
@@ -136,6 +137,14 @@ function init_all() {
register_module("paneSync", gSyncPane);
}
register_module("paneSearchResults", gSearchResultsPane);
+ if (gTorPane.enabled) {
+ document.getElementById("category-tor").hidden = false;
+ register_module("paneTor", gTorPane);
+ } else {
+ // Remove the pane from the DOM so it doesn't get incorrectly included in search results.
+ document.getElementById("template-paneTor").remove();
+ }
+
gSearchResultsPane.init();
gMainPane.preInit();
diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
index 2d29b382350d..0139abf95cbd 100644
--- a/browser/components/preferences/preferences.xhtml
+++ b/browser/components/preferences/preferences.xhtml
@@ -13,6 +13,7 @@
<?xml-stylesheet href="chrome://browser/skin/preferences/containers.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/privacy.css"?>
<?xml-stylesheet href="chrome://browser/content/securitylevel/securityLevelPreferences.css"?>
+<?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?>
<!DOCTYPE html [
<!ENTITY % aboutTorDTD SYSTEM "chrome://torbutton/locale/aboutTor.dtd">
@@ -155,6 +156,9 @@
<image class="category-icon"/>
<label class="category-name" flex="1" data-l10n-id="pane-experimental-title"></label>
</richlistitem>
+
+#include ../torpreferences/content/torCategory.inc.xhtml
+
</richlistbox>
<spacer flex="1"/>
@@ -208,6 +212,7 @@
#include containers.inc.xhtml
#include sync.inc.xhtml
#include experimental.inc.xhtml
+#include ../torpreferences/content/torPane.xhtml
</vbox>
</vbox>
</vbox>
diff --git a/browser/components/preferences/privacy.js b/browser/components/preferences/privacy.js
index 42b899e0552f..bce7bb7e8a9c 100644
--- a/browser/components/preferences/privacy.js
+++ b/browser/components/preferences/privacy.js
@@ -80,6 +80,7 @@ XPCOMUtils.defineLazyGetter(this, "AlertsServiceDND", function() {
}
});
+// TODO: module import via ChromeUtils.defineModuleGetter
XPCOMUtils.defineLazyScriptGetter(
this,
["SecurityLevelPreferences"],
diff --git a/browser/components/torpreferences/content/parseFunctions.jsm b/browser/components/torpreferences/content/parseFunctions.jsm
new file mode 100644
index 000000000000..954759de63a5
--- /dev/null
+++ b/browser/components/torpreferences/content/parseFunctions.jsm
@@ -0,0 +1,89 @@
+"use strict";
+
+var EXPORTED_SYMBOLS = [
+ "parsePort",
+ "parseAddrPort",
+ "parseUsernamePassword",
+ "parseAddrPortList",
+ "parseBridgeStrings",
+ "parsePortList",
+];
+
+// expects a string representation of an integer from 1 to 65535
+let parsePort = function(aPort) {
+ // ensure port string is a valid positive integer
+ const validIntRegex = /^[0-9]+$/;
+ if (!validIntRegex.test(aPort)) {
+ throw new Error(`Invalid PORT string : '${aPort}'`);
+ }
+
+ // ensure port value is on valid range
+ let port = Number.parseInt(aPort);
+ if (port < 1 || port > 65535) {
+ throw new Error(
+ `Invalid PORT value, needs to be on range [1,65535] : '${port}'`
+ );
+ }
+
+ return port;
+};
+// expects a string in the format: "ADDRESS:PORT"
+let parseAddrPort = function(aAddrColonPort) {
+ let tokens = aAddrColonPort.split(":");
+ if (tokens.length != 2) {
+ throw new Error(`Invalid ADDRESS:PORT string : '${aAddrColonPort}'`);
+ }
+ let address = tokens[0];
+ let port = parsePort(tokens[1]);
+ return [address, port];
+};
+
+// expects a string in the format: "USERNAME:PASSWORD"
+// split on the first colon and any subsequent go into password
+let parseUsernamePassword = function(aUsernameColonPassword) {
+ let colonIndex = aUsernameColonPassword.indexOf(":");
+ if (colonIndex < 0) {
+ // we don't log the contents of the potentially password containing string
+ throw new Error("Invalid USERNAME:PASSWORD string");
+ }
+
+ let username = aUsernameColonPassword.substring(0, colonIndex);
+ let password = aUsernameColonPassword.substring(colonIndex + 1);
+
+ return [username, password];
+};
+
+// expects a string in the format: ADDRESS:PORT,ADDRESS:PORT,...
+// returns array of ports (as ints)
+let parseAddrPortList = function(aAddrPortList) {
+ let addrPorts = aAddrPortList.split(",");
+ // parse ADDRESS:PORT string and only keep the port (second element in returned array)
+ let retval = addrPorts.map(addrPort => parseAddrPort(addrPort)[1]);
+ return retval;
+};
+
+// expects a '/n' or '/r/n' delimited bridge string, which we split and trim
+// each bridge string can also optionally have 'bridge' at the beginning ie:
+// bridge $(type) $(address):$(port) $(certificate)
+// we strip out the 'bridge' prefix here
+let parseBridgeStrings = function(aBridgeStrings) {
+
+ // replace carriage returns ('\r') with new lines ('\n')
+ aBridgeStrings = aBridgeStrings.replace(/\r/g, "\n");
+ // then replace contiguous new lines ('\n') with a single one
+ aBridgeStrings = aBridgeStrings.replace(/[\n]+/g, "\n");
+
+ // split on the newline and for each bridge string: trim, remove starting 'bridge' string
+ // finally discard entries that are empty strings; empty strings could occur if we receive
+ // a new line containing only whitespace
+ let splitStrings = aBridgeStrings.split("\n");
+ return splitStrings.map(val => val.trim().replace(/^bridge\s+/i, ""))
+ .filter(bridgeString => bridgeString != "");
+};
+
+// expecting a ',' delimited list of ints with possible white space between
+// returns an array of ints
+let parsePortList = function(aPortListString) {
+ let splitStrings = aPortListString.split(",");
+ return splitStrings.map(val => parsePort(val.trim()));
+};
diff --git a/browser/components/torpreferences/content/requestBridgeDialog.jsm b/browser/components/torpreferences/content/requestBridgeDialog.jsm
new file mode 100644
index 000000000000..807d46cdfb18
--- /dev/null
+++ b/browser/components/torpreferences/content/requestBridgeDialog.jsm
@@ -0,0 +1,204 @@
+"use strict";
+
+var EXPORTED_SYMBOLS = ["RequestBridgeDialog"];
+
+const { BridgeDB } = ChromeUtils.import("resource:///modules/BridgeDB.jsm");
+const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");
+
+class RequestBridgeDialog {
+ constructor() {
+ this._dialog = null;
+ this._submitButton = null;
+ this._dialogDescription = null;
+ this._captchaImage = null;
+ this._captchaEntryTextbox = null;
+ this._captchaRefreshButton = null;
+ this._incorrectCaptchaHbox = null;
+ this._incorrectCaptchaLabel = null;
+ this._bridges = [];
+ this._proxyURI = null;
+ }
+
+ static get selectors() {
+ return {
+ submitButton:
+ "accept" /* not really a selector but a key for dialog's getButton */,
+ dialogDescription: "description#torPreferences-requestBridge-description",
+ captchaImage: "image#torPreferences-requestBridge-captchaImage",
+ captchaEntryTextbox: "input#torPreferences-requestBridge-captchaTextbox",
+ refreshCaptchaButton:
+ "button#torPreferences-requestBridge-refreshCaptchaButton",
+ incorrectCaptchaHbox:
+ "hbox#torPreferences-requestBridge-incorrectCaptchaHbox",
+ incorrectCaptchaLabel:
+ "label#torPreferences-requestBridge-incorrectCaptchaError",
+ };
+ }
+
+ _populateXUL(dialog) {
+ const selectors = RequestBridgeDialog.selectors;
+
+ this._dialog = dialog;
+ const dialogWin = dialog.parentElement;
+ dialogWin.setAttribute(
+ "title",
+ TorStrings.settings.requestBridgeDialogTitle
+ );
+ // user may have opened a Request Bridge dialog in another tab, so update the
+ // CAPTCHA image or close out the dialog if we have a bridge list
+ this._dialog.addEventListener("focusin", () => {
+ const uri = BridgeDB.currentCaptchaImage;
+ const bridges = BridgeDB.currentBridges;
+
+ // new captcha image
+ if (uri) {
+ this._setcaptchaImage(uri);
+ } else if (bridges) {
+ this._bridges = bridges;
+ this._submitButton.disabled = false;
+ this._dialog.cancelDialog();
+ }
+ });
+
+ this._submitButton = this._dialog.getButton(selectors.submitButton);
+ this._submitButton.setAttribute("label", TorStrings.settings.submitCaptcha);
+ this._submitButton.disabled = true;
+ this._dialog.addEventListener("dialogaccept", e => {
+ e.preventDefault();
+ this.onSubmitCaptcha();
+ });
+
+ this._dialogDescription = this._dialog.querySelector(
+ selectors.dialogDescription
+ );
+ this._dialogDescription.textContent =
+ TorStrings.settings.contactingBridgeDB;
+
+ this._captchaImage = this._dialog.querySelector(selectors.captchaImage);
+
+ // request captcha from bridge db
+ BridgeDB.requestNewCaptchaImage(this._proxyURI).then(uri => {
+ this._setcaptchaImage(uri);
+ });
+
+ this._captchaEntryTextbox = this._dialog.querySelector(
+ selectors.captchaEntryTextbox
+ );
+ this._captchaEntryTextbox.setAttribute(
+ "placeholder",
+ TorStrings.settings.captchaTextboxPlaceholder
+ );
+ this._captchaEntryTextbox.disabled = true;
+ // disable submit if entry textbox is empty
+ this._captchaEntryTextbox.oninput = () => {
+ this._submitButton.disabled = this._captchaEntryTextbox.value == "";
+ };
+
+ this._captchaRefreshButton = this._dialog.querySelector(
+ selectors.refreshCaptchaButton
+ );
+ this._captchaRefreshButton.disabled = true;
+
+ this._incorrectCaptchaHbox = this._dialog.querySelector(
+ selectors.incorrectCaptchaHbox
+ );
+ this._incorrectCaptchaLabel = this._dialog.querySelector(
+ selectors.incorrectCaptchaLabel
+ );
+ this._incorrectCaptchaLabel.setAttribute(
+ "value",
+ TorStrings.settings.incorrectCaptcha
+ );
+
+ return true;
+ }
+
+ _setcaptchaImage(uri) {
+ if (uri != this._captchaImage.src) {
+ this._captchaImage.src = uri;
+ this._dialogDescription.textContent = TorStrings.settings.solveTheCaptcha;
+ this._setUIDisabled(false);
+ this._captchaEntryTextbox.focus();
+ this._captchaEntryTextbox.select();
+ }
+ }
+
+ _setUIDisabled(disabled) {
+ this._submitButton.disabled = this._captchaGuessIsEmpty() || disabled;
+ this._captchaEntryTextbox.disabled = disabled;
+ this._captchaRefreshButton.disabled = disabled;
+ }
+
+ _captchaGuessIsEmpty() {
+ return this._captchaEntryTextbox.value == "";
+ }
+
+ init(window, dialog) {
+ // defer to later until firefox has populated the dialog with all our elements
+ window.setTimeout(() => {
+ this._populateXUL(dialog);
+ }, 0);
+ }
+
+ close() {
+ BridgeDB.close();
+ }
+
+ /*
+ Event Handlers
+ */
+ onSubmitCaptcha() {
+ let captchaText = this._captchaEntryTextbox.value.trim();
+ // noop if the field is empty
+ if (captchaText == "") {
+ return;
+ }
+
+ // freeze ui while we make request
+ this._setUIDisabled(true);
+ this._incorrectCaptchaHbox.style.visibility = "hidden";
+
+ BridgeDB.submitCaptchaGuess(captchaText)
+ .then(aBridges => {
+ this._bridges = aBridges;
+
+ this._submitButton.disabled = false;
+ // This was successful, but use cancelDialog() to close, since
+ // we intercept the `dialogaccept` event.
+ this._dialog.cancelDialog();
+ })
+ .catch(aError => {
+ this._bridges = [];
+ this._setUIDisabled(false);
+ this._incorrectCaptchaHbox.style.visibility = "visible";
+ });
+ }
+
+ onRefreshCaptcha() {
+ this._setUIDisabled(true);
+ this._captchaImage.src = "";
+ this._dialogDescription.textContent =
+ TorStrings.settings.contactingBridgeDB;
+ this._captchaEntryTextbox.value = "";
+ this._incorrectCaptchaHbox.style.visibility = "hidden";
+
+ BridgeDB.requestNewCaptchaImage(this._proxyURI).then(uri => {
+ this._setcaptchaImage(uri);
+ });
+ }
+
+ openDialog(gSubDialog, aProxyURI, aCloseCallback) {
+ this._proxyURI = aProxyURI;
+ gSubDialog.open(
+ "chrome://browser/content/torpreferences/requestBridgeDialog.xhtml",
+ {
+ features: "resizable=yes",
+ closingCallback: () => {
+ this.close();
+ aCloseCallback(this._bridges);
+ }
+ },
+ this,
+ );
+ }
+}
diff --git a/browser/components/torpreferences/content/requestBridgeDialog.xhtml b/browser/components/torpreferences/content/requestBridgeDialog.xhtml
new file mode 100644
index 000000000000..64c4507807fb
--- /dev/null
+++ b/browser/components/torpreferences/content/requestBridgeDialog.xhtml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
+<?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?>
+
+<window type="child"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ xmlns:html="http://www.w3.org/1999/xhtml">
+<dialog id="torPreferences-requestBridge-dialog"
+ buttons="accept,cancel">
+ <!-- ok, so ​ is a zero-width space. We need to have *something* in the innerText so that XUL knows how tall the
+ description node is so that it can determine how large to make the dialog element's inner draw area. If we have
+ nothing in the innerText, then it collapse to 0 height, and the contents of the dialog ends up partially hidden >:( -->
+ <description id="torPreferences-requestBridge-description">​</description>
+ <!-- init to transparent 400x125 png -->
+ <image id="torPreferences-requestBridge-captchaImage" flex="1"/>
+ <hbox id="torPreferences-requestBridge-inputHbox">
+ <html:input id="torPreferences-requestBridge-captchaTextbox" type="text" style="-moz-box-flex: 1;"/>
+ <button id="torPreferences-requestBridge-refreshCaptchaButton"
+ image="chrome://browser/skin/reload.svg"
+ oncommand="requestBridgeDialog.onRefreshCaptcha();"/>
+ </hbox>
+ <hbox id="torPreferences-requestBridge-incorrectCaptchaHbox" align="center">
+ <image id="torPreferences-requestBridge-errorIcon" />
+ <label id="torPreferences-requestBridge-incorrectCaptchaError" flex="1"/>
+ </hbox>
+ <script type="application/javascript"><![CDATA[
+ "use strict";
+
+ let requestBridgeDialog = window.arguments[0];
+ let dialog = document.getElementById("torPreferences-requestBridge-dialog");
+ requestBridgeDialog.init(window, dialog);
+ ]]></script>
+</dialog>
+</window>
\ No newline at end of file
diff --git a/browser/components/torpreferences/content/torBridgeSettings.jsm b/browser/components/torpreferences/content/torBridgeSettings.jsm
new file mode 100644
index 000000000000..ceb61d3ec972
--- /dev/null
+++ b/browser/components/torpreferences/content/torBridgeSettings.jsm
@@ -0,0 +1,325 @@
+"use strict";
+
+var EXPORTED_SYMBOLS = [
+ "TorBridgeSource",
+ "TorBridgeSettings",
+ "makeTorBridgeSettingsNone",
+ "makeTorBridgeSettingsBuiltin",
+ "makeTorBridgeSettingsBridgeDB",
+ "makeTorBridgeSettingsUserProvided",
+];
+
+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 TorBridgeSource = {
+ NONE: "NONE",
+ BUILTIN: "BUILTIN",
+ BRIDGEDB: "BRIDGEDB",
+ USERPROVIDED: "USERPROVIDED",
+};
+
+class TorBridgeSettings {
+ constructor() {
+ this._bridgeSource = TorBridgeSource.NONE;
+ this._selectedDefaultBridgeType = null;
+ this._bridgeStrings = [];
+ }
+
+ get selectedDefaultBridgeType() {
+ if (this._bridgeSource == TorBridgeSource.BUILTIN) {
+ return this._selectedDefaultBridgeType;
+ }
+ return undefined;
+ }
+
+ get bridgeSource() {
+ return this._bridgeSource;
+ }
+
+ // for display
+ get bridgeStrings() {
+ return this._bridgeStrings.join("\n");
+ }
+
+ // raw
+ get bridgeStringsArray() {
+ return this._bridgeStrings;
+ }
+
+ static get defaultBridgeTypes() {
+ if (TorBridgeSettings._defaultBridgeTypes) {
+ return TorBridgeSettings._defaultBridgeTypes;
+ }
+
+ let bridgeListBranch = Services.prefs.getBranch(
+ TorStrings.preferenceBranches.defaultBridge
+ );
+ let bridgePrefs = bridgeListBranch.getChildList("", {});
+
+ // an unordered set for shoving bridge types into
+ let bridgeTypes = new Set();
+ // look for keys ending in ".N" and treat string before that as the bridge type
+ const pattern = /\.[0-9]+$/;
+ for (const key of bridgePrefs) {
+ const offset = key.search(pattern);
+ if (offset != -1) {
+ const bt = key.substring(0, offset);
+ bridgeTypes.add(bt);
+ }
+ }
+
+ // recommended bridge type goes first in the list
+ let recommendedBridgeType = Services.prefs.getCharPref(
+ TorStrings.preferenceKeys.recommendedBridgeType,
+ null
+ );
+
+ let retval = [];
+ if (recommendedBridgeType && bridgeTypes.has(recommendedBridgeType)) {
+ retval.push(recommendedBridgeType);
+ }
+
+ for (const bridgeType of bridgeTypes.values()) {
+ if (bridgeType != recommendedBridgeType) {
+ retval.push(bridgeType);
+ }
+ }
+
+ // cache off
+ TorBridgeSettings._defaultBridgeTypes = retval;
+ return retval;
+ }
+
+ _readDefaultBridges(aBridgeType) {
+ let bridgeBranch = Services.prefs.getBranch(
+ TorStrings.preferenceBranches.defaultBridge
+ );
+ let bridgeBranchPrefs = bridgeBranch.getChildList("", {});
+
+ let retval = [];
+
+ // regex matches against strings ending in ".N" where N is a positive integer
+ let pattern = /\.[0-9]+$/;
+ for (const key of bridgeBranchPrefs) {
+ // verify the location of the match is the correct offset required for aBridgeType
+ // to fit, and that the string begins with aBridgeType
+ if (
+ key.search(pattern) == aBridgeType.length &&
+ key.startsWith(aBridgeType)
+ ) {
+ let bridgeStr = bridgeBranch.getCharPref(key);
+ retval.push(bridgeStr);
+ }
+ }
+
+ // fisher-yates shuffle
+ // shuffle so that Tor Browser users don't all try the built-in bridges in the same order
+ for (let i = retval.length - 1; i > 0; --i) {
+ // number n such that 0.0 <= n < 1.0
+ const n = Math.random();
+ // integer j such that 0 <= j <= i
+ const j = Math.floor(n * (i + 1));
+
+ // swap values at indices i and j
+ const tmp = retval[i];
+ retval[i] = retval[j];
+ retval[j] = tmp;
+ }
+
+ return retval;
+ }
+
+ _readBridgeDBBridges() {
+ let bridgeBranch = Services.prefs.getBranch(
+ `${TorStrings.preferenceBranches.bridgeDBBridges}`
+ );
+ let bridgeBranchPrefs = bridgeBranch.getChildList("", {});
+ // the child prefs do not come in any particular order so sort the keys
+ // so the values can be compared to what we get out off torrc
+ bridgeBranchPrefs.sort();
+
+ // just assume all of the prefs under the parent point to valid bridge string
+ let retval = bridgeBranchPrefs.map(key =>
+ bridgeBranch.getCharPref(key).trim()
+ );
+
+ return retval;
+ }
+
+ _readTorrcBridges() {
+ let bridgeList = TorProtocolService.readStringArraySetting(
+ TorStrings.configKeys.bridgeList
+ );
+
+ let retval = [];
+ for (const line of bridgeList) {
+ let trimmedLine = line.trim();
+ if (trimmedLine) {
+ retval.push(trimmedLine);
+ }
+ }
+
+ return retval;
+ }
+
+ // analagous to initBridgeSettings()
+ readSettings() {
+ // restore to defaults
+ this._bridgeSource = TorBridgeSource.NONE;
+ this._selectedDefaultBridgeType = null;
+ this._bridgeStrings = [];
+
+ // So the way tor-launcher determines the origin of the configured bridges is a bit
+ // weird and depends on inferring our scenario based on some firefox prefs and the
+ // relationship between the saved list of bridges in about:config vs the list saved in torrc
+
+ // first off, if "extensions.torlauncher.default_bridge_type" is set to one of our
+ // builtin default types (obfs4, meek-azure, snowflake, etc) then we provide the
+ // bridges in "extensions.torlauncher.default_bridge.*" (filtered by our default_bridge_type)
+
+ // next, we compare the list of bridges saved in torrc to the bridges stored in the
+ // "extensions.torlauncher.bridgedb_bridge."" branch. If they match *exactly* then we assume
+ // the bridges were retrieved from BridgeDB and use those. If the torrc list is empty then we know
+ // we have no bridge settings
+
+ // finally, if none of the previous conditions are not met, it is assumed the bridges stored in
+ // torrc are user-provided
+
+ // what we should(?) do once we excise tor-launcher entirely is explicitly store an int/enum in
+ // about:config that tells us which scenario we are in so we don't have to guess
+
+ let defaultBridgeType = Services.prefs.getCharPref(
+ TorStrings.preferenceKeys.defaultBridgeType,
+ null
+ );
+
+ // check if source is BUILTIN
+ if (defaultBridgeType) {
+ this._bridgeStrings = this._readDefaultBridges(defaultBridgeType);
+ this._bridgeSource = TorBridgeSource.BUILTIN;
+ this._selectedDefaultBridgeType = defaultBridgeType;
+ return;
+ }
+
+ let torrcBridges = this._readTorrcBridges();
+
+ // no stored bridges means no bridge is in use
+ if (torrcBridges.length == 0) {
+ this._bridgeStrings = [];
+ this._bridgeSource = TorBridgeSource.NONE;
+ return;
+ }
+
+ let bridgedbBridges = this._readBridgeDBBridges();
+
+ // if these two lists are equal then we got our bridges from bridgedb
+ // ie: same element in identical order
+ let arraysEqual = (left, right) => {
+ if (left.length != right.length) {
+ return false;
+ }
+ const length = left.length;
+ for (let i = 0; i < length; ++i) {
+ if (left[i] != right[i]) {
+ return false;
+ }
+ }
+ return true;
+ };
+
+ // agreement between prefs and torrc means bridgedb bridges
+ if (arraysEqual(torrcBridges, bridgedbBridges)) {
+ this._bridgeStrings = torrcBridges;
+ this._bridgeSource = TorBridgeSource.BRIDGEDB;
+ return;
+ }
+
+ // otherwise they must be user provided
+ this._bridgeStrings = torrcBridges;
+ this._bridgeSource = TorBridgeSource.USERPROVIDED;
+ }
+
+ writeSettings() {
+ let settingsObject = new Map();
+
+ // init tor bridge settings to null
+ settingsObject.set(TorStrings.configKeys.useBridges, null);
+ settingsObject.set(TorStrings.configKeys.bridgeList, null);
+
+ // clear bridge related firefox prefs
+ Services.prefs.setCharPref(TorStrings.preferenceKeys.defaultBridgeType, "");
+ let bridgeBranch = Services.prefs.getBranch(
+ `${TorStrings.preferenceBranches.bridgeDBBridges}`
+ );
+ let bridgeBranchPrefs = bridgeBranch.getChildList("", {});
+ for (const pref of bridgeBranchPrefs) {
+ Services.prefs.clearUserPref(
+ `${TorStrings.preferenceBranches.bridgeDBBridges}${pref}`
+ );
+ }
+
+ switch (this._bridgeSource) {
+ case TorBridgeSource.BUILTIN:
+ // set builtin bridge type to use in prefs
+ Services.prefs.setCharPref(
+ TorStrings.preferenceKeys.defaultBridgeType,
+ this._selectedDefaultBridgeType
+ );
+ break;
+ case TorBridgeSource.BRIDGEDB:
+ // save bridges off to prefs
+ for (let i = 0; i < this.bridgeStringsArray.length; ++i) {
+ Services.prefs.setCharPref(
+ `${TorStrings.preferenceBranches.bridgeDBBridges}${i}`,
+ this.bridgeStringsArray[i]
+ );
+ }
+ break;
+ }
+
+ // write over our bridge list if bridges are enabled
+ if (this._bridgeSource != TorBridgeSource.NONE) {
+ settingsObject.set(TorStrings.configKeys.useBridges, true);
+ settingsObject.set(
+ TorStrings.configKeys.bridgeList,
+ this.bridgeStringsArray
+ );
+ }
+ TorProtocolService.writeSettings(settingsObject);
+ }
+}
+
+function makeTorBridgeSettingsNone() {
+ return new TorBridgeSettings();
+}
+
+function makeTorBridgeSettingsBuiltin(aBridgeType) {
+ let retval = new TorBridgeSettings();
+ retval._bridgeSource = TorBridgeSource.BUILTIN;
+ retval._selectedDefaultBridgeType = aBridgeType;
+ retval._bridgeStrings = retval._readDefaultBridges(aBridgeType);
+
+ return retval;
+}
+
+function makeTorBridgeSettingsBridgeDB(aBridges) {
+ let retval = new TorBridgeSettings();
+ retval._bridgeSource = TorBridgeSource.BRIDGEDB;
+ retval._selectedDefaultBridgeType = null;
+ retval._bridgeStrings = aBridges;
+
+ return retval;
+}
+
+function makeTorBridgeSettingsUserProvided(aBridges) {
+ let retval = new TorBridgeSettings();
+ retval._bridgeSource = TorBridgeSource.USERPROVIDED;
+ retval._selectedDefaultBridgeType = null;
+ retval._bridgeStrings = aBridges;
+
+ return retval;
+}
diff --git a/browser/components/torpreferences/content/torCategory.inc.xhtml b/browser/components/torpreferences/content/torCategory.inc.xhtml
new file mode 100644
index 000000000000..abe56200f571
--- /dev/null
+++ b/browser/components/torpreferences/content/torCategory.inc.xhtml
@@ -0,0 +1,9 @@
+<richlistitem id="category-tor"
+ class="category"
+ value="paneTor"
+ helpTopic="prefs-tor"
+ align="center"
+ hidden="true">
+ <image class="category-icon"/>
+ <label id="torPreferences-labelCategory" class="category-name" flex="1" value="Tor"/>
+</richlistitem>
diff --git a/browser/components/torpreferences/content/torFirewallSettings.jsm b/browser/components/torpreferences/content/torFirewallSettings.jsm
new file mode 100644
index 000000000000..e77f18ef2fae
--- /dev/null
+++ b/browser/components/torpreferences/content/torFirewallSettings.jsm
@@ -0,0 +1,72 @@
+"use strict";
+
+var EXPORTED_SYMBOLS = [
+ "TorFirewallSettings",
+ "makeTorFirewallSettingsNone",
+ "makeTorFirewallSettingsCustom",
+];
+
+const { TorProtocolService } = ChromeUtils.import(
+ "resource:///modules/TorProtocolService.jsm"
+);
+const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");
+const { parseAddrPortList } = ChromeUtils.import(
+ "chrome://browser/content/torpreferences/parseFunctions.jsm"
+);
+
+class TorFirewallSettings {
+ constructor() {
+ this._allowedPorts = [];
+ }
+
+ get portsConfigurationString() {
+ let portStrings = this._allowedPorts.map(port => `*:${port}`);
+ return portStrings.join(",");
+ }
+
+ get commaSeparatedListString() {
+ return this._allowedPorts.join(",");
+ }
+
+ get hasPorts() {
+ return this._allowedPorts.length > 0;
+ }
+
+ readSettings() {
+ let addressPortList = TorProtocolService.readStringSetting(
+ TorStrings.configKeys.reachableAddresses
+ );
+
+ let allowedPorts = [];
+ if (addressPortList) {
+ allowedPorts = parseAddrPortList(addressPortList);
+ }
+ this._allowedPorts = allowedPorts;
+ }
+
+ writeSettings() {
+ let settingsObject = new Map();
+
+ // init to null so Tor daemon resets if no ports
+ settingsObject.set(TorStrings.configKeys.reachableAddresses, null);
+
+ if (this._allowedPorts.length > 0) {
+ settingsObject.set(
+ TorStrings.configKeys.reachableAddresses,
+ this.portsConfigurationString
+ );
+ }
+
+ TorProtocolService.writeSettings(settingsObject);
+ }
+}
+
+function makeTorFirewallSettingsNone() {
+ return new TorFirewallSettings();
+}
+
+function makeTorFirewallSettingsCustom(aPortsList) {
+ let retval = new TorFirewallSettings();
+ retval._allowedPorts = aPortsList;
+ return retval;
+}
diff --git a/browser/components/torpreferences/content/torLogDialog.jsm b/browser/components/torpreferences/content/torLogDialog.jsm
new file mode 100644
index 000000000000..ecc684d878c2
--- /dev/null
+++ b/browser/components/torpreferences/content/torLogDialog.jsm
@@ -0,0 +1,66 @@
+"use strict";
+
+var EXPORTED_SYMBOLS = ["TorLogDialog"];
+
+const { TorProtocolService } = ChromeUtils.import(
+ "resource:///modules/TorProtocolService.jsm"
+);
+const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");
+
+class TorLogDialog {
+ constructor() {
+ this._dialog = null;
+ this._logTextarea = null;
+ this._copyLogButton = null;
+ }
+
+ static get selectors() {
+ return {
+ copyLogButton: "extra1",
+ logTextarea: "textarea#torPreferences-torDialog-textarea",
+ };
+ }
+
+ _populateXUL(aDialog) {
+ this._dialog = aDialog;
+ const dialogWin = this._dialog.parentElement;
+ dialogWin.setAttribute("title", TorStrings.settings.torLogDialogTitle);
+
+ this._logTextarea = this._dialog.querySelector(
+ TorLogDialog.selectors.logTextarea
+ );
+
+ this._copyLogButton = this._dialog.getButton(
+ TorLogDialog.selectors.copyLogButton
+ );
+ this._copyLogButton.setAttribute("label", TorStrings.settings.copyLog);
+ this._copyLogButton.addEventListener("command", () => {
+ this.copyTorLog();
+ });
+
+ this._logTextarea.value = TorProtocolService.getLog();
+ }
+
+ init(window, aDialog) {
+ // defer to later until firefox has populated the dialog with all our elements
+ window.setTimeout(() => {
+ this._populateXUL(aDialog);
+ }, 0);
+ }
+
+ copyTorLog() {
+ // Copy tor log messages to the system clipboard.
+ let clipboard = Cc["@mozilla.org/widget/clipboardhelper;1"].getService(
+ Ci.nsIClipboardHelper
+ );
+ clipboard.copyString(this._logTextarea.value);
+ }
+
+ openDialog(gSubDialog) {
+ gSubDialog.open(
+ "chrome://browser/content/torpreferences/torLogDialog.xhtml",
+ { features: "resizable=yes" },
+ this
+ );
+ }
+}
diff --git a/browser/components/torpreferences/content/torLogDialog.xhtml b/browser/components/torpreferences/content/torLogDialog.xhtml
new file mode 100644
index 000000000000..9c17f8132978
--- /dev/null
+++ b/browser/components/torpreferences/content/torLogDialog.xhtml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
+<?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?>
+
+<window type="child"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ xmlns:html="http://www.w3.org/1999/xhtml">
+<dialog id="torPreferences-torLog-dialog"
+ buttons="accept,extra1">
+ <html:textarea
+ id="torPreferences-torDialog-textarea"
+ multiline="true"
+ readonly="true"/>
+ <script type="application/javascript"><![CDATA[
+ "use strict";
+
+ let torLogDialog = window.arguments[0];
+ let dialog = document.getElementById("torPreferences-torLog-dialog");
+ torLogDialog.init(window, dialog);
+ ]]></script>
+</dialog>
+</window>
\ No newline at end of file
diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js
new file mode 100644
index 000000000000..49054b5dac6a
--- /dev/null
+++ b/browser/components/torpreferences/content/torPane.js
@@ -0,0 +1,857 @@
+"use strict";
+
+const { TorProtocolService } = ChromeUtils.import(
+ "resource:///modules/TorProtocolService.jsm"
+);
+
+const {
+ TorBridgeSource,
+ TorBridgeSettings,
+ makeTorBridgeSettingsNone,
+ makeTorBridgeSettingsBuiltin,
+ makeTorBridgeSettingsBridgeDB,
+ makeTorBridgeSettingsUserProvided,
+} = ChromeUtils.import(
+ "chrome://browser/content/torpreferences/torBridgeSettings.jsm"
+);
+
+const {
+ TorProxyType,
+ TorProxySettings,
+ makeTorProxySettingsNone,
+ makeTorProxySettingsSocks4,
+ makeTorProxySettingsSocks5,
+ makeTorProxySettingsHTTPS,
+} = ChromeUtils.import(
+ "chrome://browser/content/torpreferences/torProxySettings.jsm"
+);
+const {
+ TorFirewallSettings,
+ makeTorFirewallSettingsNone,
+ makeTorFirewallSettingsCustom,
+} = ChromeUtils.import(
+ "chrome://browser/content/torpreferences/torFirewallSettings.jsm"
+);
+
+const { TorLogDialog } = ChromeUtils.import(
+ "chrome://browser/content/torpreferences/torLogDialog.jsm"
+);
+
+const { RequestBridgeDialog } = ChromeUtils.import(
+ "chrome://browser/content/torpreferences/requestBridgeDialog.jsm"
+);
+
+ChromeUtils.defineModuleGetter(
+ this,
+ "TorStrings",
+ "resource:///modules/TorStrings.jsm"
+);
+
+const { parsePort, parseBridgeStrings, parsePortList } = ChromeUtils.import(
+ "chrome://browser/content/torpreferences/parseFunctions.jsm"
+);
+
+/*
+ Tor Pane
+
+ Code for populating the XUL in about:preferences#tor, handling input events, interfacing with tor-launcher
+*/
+const gTorPane = (function() {
+ /* CSS selectors for all of the Tor Network DOM elements we need to access */
+ const selectors = {
+ category: {
+ title: "label#torPreferences-labelCategory",
+ },
+ torPreferences: {
+ header: "h1#torPreferences-header",
+ description: "span#torPreferences-description",
+ learnMore: "label#torPreferences-learnMore",
+ },
+ bridges: {
+ header: "h2#torPreferences-bridges-header",
+ description: "span#torPreferences-bridges-description",
+ learnMore: "label#torPreferences-bridges-learnMore",
+ useBridgeCheckbox: "checkbox#torPreferences-bridges-toggle",
+ bridgeSelectionRadiogroup:
+ "radiogroup#torPreferences-bridges-bridgeSelection",
+ builtinBridgeOption: "radio#torPreferences-bridges-radioBuiltin",
+ builtinBridgeList: "menulist#torPreferences-bridges-builtinList",
+ requestBridgeOption: "radio#torPreferences-bridges-radioRequestBridge",
+ requestBridgeButton: "button#torPreferences-bridges-buttonRequestBridge",
+ requestBridgeTextarea:
+ "textarea#torPreferences-bridges-textareaRequestBridge",
+ provideBridgeOption: "radio#torPreferences-bridges-radioProvideBridge",
+ provideBridgeDescription:
+ "description#torPreferences-bridges-descriptionProvideBridge",
+ provideBridgeTextarea:
+ "textarea#torPreferences-bridges-textareaProvideBridge",
+ },
+ advanced: {
+ header: "h2#torPreferences-advanced-header",
+ description: "span#torPreferences-advanced-description",
+ learnMore: "label#torPreferences-advanced-learnMore",
+ useProxyCheckbox: "checkbox#torPreferences-advanced-toggleProxy",
+ proxyTypeLabel: "label#torPreferences-localProxy-type",
+ proxyTypeList: "menulist#torPreferences-localProxy-builtinList",
+ proxyAddressLabel: "label#torPreferences-localProxy-address",
+ proxyAddressTextbox: "input#torPreferences-localProxy-textboxAddress",
+ proxyPortLabel: "label#torPreferences-localProxy-port",
+ proxyPortTextbox: "input#torPreferences-localProxy-textboxPort",
+ proxyUsernameLabel: "label#torPreferences-localProxy-username",
+ proxyUsernameTextbox: "input#torPreferences-localProxy-textboxUsername",
+ proxyPasswordLabel: "label#torPreferences-localProxy-password",
+ proxyPasswordTextbox: "input#torPreferences-localProxy-textboxPassword",
+ useFirewallCheckbox: "checkbox#torPreferences-advanced-toggleFirewall",
+ firewallAllowedPortsLabel: "label#torPreferences-advanced-allowedPorts",
+ firewallAllowedPortsTextbox:
+ "input#torPreferences-advanced-textboxAllowedPorts",
+ torLogsLabel: "label#torPreferences-torLogs",
+ torLogsButton: "button#torPreferences-buttonTorLogs",
+ },
+ }; /* selectors */
+
+ let retval = {
+ // cached frequently accessed DOM elements
+ _useBridgeCheckbox: null,
+ _bridgeSelectionRadiogroup: null,
+ _builtinBridgeOption: null,
+ _builtinBridgeMenulist: null,
+ _requestBridgeOption: null,
+ _requestBridgeButton: null,
+ _requestBridgeTextarea: null,
+ _provideBridgeOption: null,
+ _provideBridgeTextarea: null,
+ _useProxyCheckbox: null,
+ _proxyTypeLabel: null,
+ _proxyTypeMenulist: null,
+ _proxyAddressLabel: null,
+ _proxyAddressTextbox: null,
+ _proxyPortLabel: null,
+ _proxyPortTextbox: null,
+ _proxyUsernameLabel: null,
+ _proxyUsernameTextbox: null,
+ _proxyPasswordLabel: null,
+ _proxyPasswordTextbox: null,
+ _useFirewallCheckbox: null,
+ _allowedPortsLabel: null,
+ _allowedPortsTextbox: null,
+
+ // tor network settings
+ _bridgeSettings: null,
+ _proxySettings: null,
+ _firewallSettings: null,
+
+ // disables the provided list of elements
+ _setElementsDisabled(elements, disabled) {
+ for (let currentElement of elements) {
+ currentElement.disabled = disabled;
+ }
+ },
+
+ // populate xul with strings and cache the relevant elements
+ _populateXUL() {
+ // saves tor settings to disk when navigate away from about:preferences
+ window.addEventListener("blur", val => {
+ TorProtocolService.flushSettings();
+ });
+
+ document
+ .querySelector(selectors.category.title)
+ .setAttribute("value", TorStrings.settings.categoryTitle);
+
+ let prefpane = document.getElementById("mainPrefPane");
+
+ // Heading
+ prefpane.querySelector(selectors.torPreferences.header).innerText =
+ TorStrings.settings.torPreferencesHeading;
+ prefpane.querySelector(selectors.torPreferences.description).textContent =
+ TorStrings.settings.torPreferencesDescription;
+ {
+ let learnMore = prefpane.querySelector(
+ selectors.torPreferences.learnMore
+ );
+ learnMore.setAttribute("value", TorStrings.settings.learnMore);
+ learnMore.setAttribute(
+ "href",
+ TorStrings.settings.learnMoreTorBrowserURL
+ );
+ }
+
+ // Bridge setup
+ prefpane.querySelector(selectors.bridges.header).innerText =
+ TorStrings.settings.bridgesHeading;
+ prefpane.querySelector(selectors.bridges.description).textContent =
+ TorStrings.settings.bridgesDescription;
+ {
+ let learnMore = prefpane.querySelector(selectors.bridges.learnMore);
+ learnMore.setAttribute("value", TorStrings.settings.learnMore);
+ learnMore.setAttribute("href", TorStrings.settings.learnMoreBridgesURL);
+ }
+
+ this._useBridgeCheckbox = prefpane.querySelector(
+ selectors.bridges.useBridgeCheckbox
+ );
+ this._useBridgeCheckbox.setAttribute(
+ "label",
+ TorStrings.settings.useBridge
+ );
+ this._useBridgeCheckbox.addEventListener("command", e => {
+ const checked = this._useBridgeCheckbox.checked;
+ gTorPane.onToggleBridge(checked).onUpdateBridgeSettings();
+ });
+ this._bridgeSelectionRadiogroup = prefpane.querySelector(
+ selectors.bridges.bridgeSelectionRadiogroup
+ );
+ this._bridgeSelectionRadiogroup.value = TorBridgeSource.BUILTIN;
+ this._bridgeSelectionRadiogroup.addEventListener("command", e => {
+ const value = this._bridgeSelectionRadiogroup.value;
+ gTorPane.onSelectBridgeOption(value).onUpdateBridgeSettings();
+ });
+
+ // Builtin bridges
+ this._builtinBridgeOption = prefpane.querySelector(
+ selectors.bridges.builtinBridgeOption
+ );
+ this._builtinBridgeOption.setAttribute(
+ "label",
+ TorStrings.settings.selectBridge
+ );
+ this._builtinBridgeOption.setAttribute("value", TorBridgeSource.BUILTIN);
+ this._builtinBridgeMenulist = prefpane.querySelector(
+ selectors.bridges.builtinBridgeList
+ );
+ this._builtinBridgeMenulist.addEventListener("command", e => {
+ gTorPane.onUpdateBridgeSettings();
+ });
+
+ // Request bridge
+ this._requestBridgeOption = prefpane.querySelector(
+ selectors.bridges.requestBridgeOption
+ );
+ this._requestBridgeOption.setAttribute(
+ "label",
+ TorStrings.settings.requestBridgeFromTorProject
+ );
+ this._requestBridgeOption.setAttribute("value", TorBridgeSource.BRIDGEDB);
+ this._requestBridgeButton = prefpane.querySelector(
+ selectors.bridges.requestBridgeButton
+ );
+ this._requestBridgeButton.setAttribute(
+ "label",
+ TorStrings.settings.requestNewBridge
+ );
+ this._requestBridgeButton.addEventListener("command", () =>
+ gTorPane.onRequestBridge()
+ );
+ this._requestBridgeTextarea = prefpane.querySelector(
+ selectors.bridges.requestBridgeTextarea
+ );
+
+ // Provide a bridge
+ this._provideBridgeOption = prefpane.querySelector(
+ selectors.bridges.provideBridgeOption
+ );
+ this._provideBridgeOption.setAttribute(
+ "label",
+ TorStrings.settings.provideBridge
+ );
+ this._provideBridgeOption.setAttribute(
+ "value",
+ TorBridgeSource.USERPROVIDED
+ );
+ prefpane.querySelector(
+ selectors.bridges.provideBridgeDescription
+ ).textContent = TorStrings.settings.provideBridgeDirections;
+ this._provideBridgeTextarea = prefpane.querySelector(
+ selectors.bridges.provideBridgeTextarea
+ );
+ this._provideBridgeTextarea.setAttribute(
+ "placeholder",
+ TorStrings.settings.provideBridgePlaceholder
+ );
+ this._provideBridgeTextarea.addEventListener("blur", () => {
+ gTorPane.onUpdateBridgeSettings();
+ });
+
+ // Advanced setup
+ prefpane.querySelector(selectors.advanced.header).innerText =
+ TorStrings.settings.advancedHeading;
+ prefpane.querySelector(selectors.advanced.description).textContent =
+ TorStrings.settings.advancedDescription;
+ {
+ let learnMore = prefpane.querySelector(selectors.advanced.learnMore);
+ learnMore.setAttribute("value", TorStrings.settings.learnMore);
+ learnMore.setAttribute(
+ "href",
+ TorStrings.settings.learnMoreNetworkSettingsURL
+ );
+ }
+
+ // Local Proxy
+ this._useProxyCheckbox = prefpane.querySelector(
+ selectors.advanced.useProxyCheckbox
+ );
+ this._useProxyCheckbox.setAttribute(
+ "label",
+ TorStrings.settings.useLocalProxy
+ );
+ this._useProxyCheckbox.addEventListener("command", e => {
+ const checked = this._useProxyCheckbox.checked;
+ gTorPane.onToggleProxy(checked).onUpdateProxySettings();
+ });
+ this._proxyTypeLabel = prefpane.querySelector(
+ selectors.advanced.proxyTypeLabel
+ );
+ this._proxyTypeLabel.setAttribute("value", TorStrings.settings.proxyType);
+
+ let mockProxies = [
+ {
+ value: TorProxyType.SOCKS4,
+ label: TorStrings.settings.proxyTypeSOCKS4,
+ },
+ {
+ value: TorProxyType.SOCKS5,
+ label: TorStrings.settings.proxyTypeSOCKS5,
+ },
+ { value: TorProxyType.HTTPS, label: TorStrings.settings.proxyTypeHTTP },
+ ];
+ this._proxyTypeMenulist = prefpane.querySelector(
+ selectors.advanced.proxyTypeList
+ );
+ this._proxyTypeMenulist.addEventListener("command", e => {
+ const value = this._proxyTypeMenulist.value;
+ gTorPane.onSelectProxyType(value).onUpdateProxySettings();
+ });
+ for (let currentProxy of mockProxies) {
+ let menuEntry = document.createXULElement("menuitem");
+ menuEntry.setAttribute("value", currentProxy.value);
+ menuEntry.setAttribute("label", currentProxy.label);
+ this._proxyTypeMenulist
+ .querySelector("menupopup")
+ .appendChild(menuEntry);
+ }
+
+ this._proxyAddressLabel = prefpane.querySelector(
+ selectors.advanced.proxyAddressLabel
+ );
+ this._proxyAddressLabel.setAttribute(
+ "value",
+ TorStrings.settings.proxyAddress
+ );
+ this._proxyAddressTextbox = prefpane.querySelector(
+ selectors.advanced.proxyAddressTextbox
+ );
+ this._proxyAddressTextbox.setAttribute(
+ "placeholder",
+ TorStrings.settings.proxyAddressPlaceholder
+ );
+ this._proxyAddressTextbox.addEventListener("blur", () => {
+ gTorPane.onUpdateProxySettings();
+ });
+ this._proxyPortLabel = prefpane.querySelector(
+ selectors.advanced.proxyPortLabel
+ );
+ this._proxyPortLabel.setAttribute("value", TorStrings.settings.proxyPort);
+ this._proxyPortTextbox = prefpane.querySelector(
+ selectors.advanced.proxyPortTextbox
+ );
+ this._proxyPortTextbox.addEventListener("blur", () => {
+ gTorPane.onUpdateProxySettings();
+ });
+ this._proxyUsernameLabel = prefpane.querySelector(
+ selectors.advanced.proxyUsernameLabel
+ );
+ this._proxyUsernameLabel.setAttribute(
+ "value",
+ TorStrings.settings.proxyUsername
+ );
+ this._proxyUsernameTextbox = prefpane.querySelector(
+ selectors.advanced.proxyUsernameTextbox
+ );
+ this._proxyUsernameTextbox.setAttribute(
+ "placeholder",
+ TorStrings.settings.proxyUsernamePasswordPlaceholder
+ );
+ this._proxyUsernameTextbox.addEventListener("blur", () => {
+ gTorPane.onUpdateProxySettings();
+ });
+ this._proxyPasswordLabel = prefpane.querySelector(
+ selectors.advanced.proxyPasswordLabel
+ );
+ this._proxyPasswordLabel.setAttribute(
+ "value",
+ TorStrings.settings.proxyPassword
+ );
+ this._proxyPasswordTextbox = prefpane.querySelector(
+ selectors.advanced.proxyPasswordTextbox
+ );
+ this._proxyPasswordTextbox.setAttribute(
+ "placeholder",
+ TorStrings.settings.proxyUsernamePasswordPlaceholder
+ );
+ this._proxyPasswordTextbox.addEventListener("blur", () => {
+ gTorPane.onUpdateProxySettings();
+ });
+
+ // Local firewall
+ this._useFirewallCheckbox = prefpane.querySelector(
+ selectors.advanced.useFirewallCheckbox
+ );
+ this._useFirewallCheckbox.setAttribute(
+ "label",
+ TorStrings.settings.useFirewall
+ );
+ this._useFirewallCheckbox.addEventListener("command", e => {
+ const checked = this._useFirewallCheckbox.checked;
+ gTorPane.onToggleFirewall(checked).onUpdateFirewallSettings();
+ });
+ this._allowedPortsLabel = prefpane.querySelector(
+ selectors.advanced.firewallAllowedPortsLabel
+ );
+ this._allowedPortsLabel.setAttribute(
+ "value",
+ TorStrings.settings.allowedPorts
+ );
+ this._allowedPortsTextbox = prefpane.querySelector(
+ selectors.advanced.firewallAllowedPortsTextbox
+ );
+ this._allowedPortsTextbox.setAttribute(
+ "placeholder",
+ TorStrings.settings.allowedPortsPlaceholder
+ );
+ this._allowedPortsTextbox.addEventListener("blur", () => {
+ gTorPane.onUpdateFirewallSettings();
+ });
+
+ // Tor logs
+ prefpane
+ .querySelector(selectors.advanced.torLogsLabel)
+ .setAttribute("value", TorStrings.settings.showTorDaemonLogs);
+ let torLogsButton = prefpane.querySelector(
+ selectors.advanced.torLogsButton
+ );
+ torLogsButton.setAttribute("label", TorStrings.settings.showLogs);
+ torLogsButton.addEventListener("command", () => {
+ gTorPane.onViewTorLogs();
+ });
+
+ // Disable all relevant elements by default
+ this._setElementsDisabled(
+ [
+ this._builtinBridgeOption,
+ this._builtinBridgeMenulist,
+ this._requestBridgeOption,
+ this._requestBridgeButton,
+ this._requestBridgeTextarea,
+ this._provideBridgeOption,
+ this._provideBridgeTextarea,
+ this._proxyTypeLabel,
+ this._proxyTypeMenulist,
+ this._proxyAddressLabel,
+ this._proxyAddressTextbox,
+ this._proxyPortLabel,
+ this._proxyPortTextbox,
+ this._proxyUsernameLabel,
+ this._proxyUsernameTextbox,
+ this._proxyPasswordLabel,
+ this._proxyPasswordTextbox,
+ this._allowedPortsLabel,
+ this._allowedPortsTextbox,
+ ],
+ true
+ );
+
+ // load bridge settings
+ let torBridgeSettings = new TorBridgeSettings();
+ torBridgeSettings.readSettings();
+
+ // populate the bridge list
+ for (let currentBridge of TorBridgeSettings.defaultBridgeTypes) {
+ let menuEntry = document.createXULElement("menuitem");
+ menuEntry.setAttribute("value", currentBridge);
+ menuEntry.setAttribute("label", currentBridge);
+ this._builtinBridgeMenulist
+ .querySelector("menupopup")
+ .appendChild(menuEntry);
+ }
+
+ this.onSelectBridgeOption(torBridgeSettings.bridgeSource);
+ this.onToggleBridge(
+ torBridgeSettings.bridgeSource != TorBridgeSource.NONE
+ );
+ switch (torBridgeSettings.bridgeSource) {
+ case TorBridgeSource.NONE:
+ break;
+ case TorBridgeSource.BUILTIN:
+ this._builtinBridgeMenulist.value =
+ torBridgeSettings.selectedDefaultBridgeType;
+ break;
+ case TorBridgeSource.BRIDGEDB:
+ this._requestBridgeTextarea.value = torBridgeSettings.bridgeStrings;
+ break;
+ case TorBridgeSource.USERPROVIDED:
+ this._provideBridgeTextarea.value = torBridgeSettings.bridgeStrings;
+ break;
+ }
+
+ this._bridgeSettings = torBridgeSettings;
+
+ // load proxy settings
+ let torProxySettings = new TorProxySettings();
+ torProxySettings.readSettings();
+
+ if (torProxySettings.type != TorProxyType.NONE) {
+ this.onToggleProxy(true);
+ this.onSelectProxyType(torProxySettings.type);
+ this._proxyAddressTextbox.value = torProxySettings.address;
+ this._proxyPortTextbox.value = torProxySettings.port;
+ this._proxyUsernameTextbox.value = torProxySettings.username;
+ this._proxyPasswordTextbox.value = torProxySettings.password;
+ }
+
+ this._proxySettings = torProxySettings;
+
+ // load firewall settings
+ let torFirewallSettings = new TorFirewallSettings();
+ torFirewallSettings.readSettings();
+
+ if (torFirewallSettings.hasPorts) {
+ this.onToggleFirewall(true);
+ this._allowedPortsTextbox.value =
+ torFirewallSettings.commaSeparatedListString;
+ }
+
+ this._firewallSettings = torFirewallSettings;
+ },
+
+ init() {
+ this._populateXUL();
+ },
+
+ // whether the page should be present in about:preferences
+ get enabled() {
+ return TorProtocolService.ownsTorDaemon;
+ },
+
+ //
+ // Callbacks
+ //
+
+ // callback when using bridges toggled
+ onToggleBridge(enabled) {
+ this._useBridgeCheckbox.checked = enabled;
+ let disabled = !enabled;
+
+ // first disable all the bridge related elements
+ this._setElementsDisabled(
+ [
+ this._builtinBridgeOption,
+ this._builtinBridgeMenulist,
+ this._requestBridgeOption,
+ this._requestBridgeButton,
+ this._requestBridgeTextarea,
+ this._provideBridgeOption,
+ this._provideBridgeTextarea,
+ ],
+ disabled
+ );
+
+ // and selectively re-enable based on the radiogroup's current value
+ if (enabled) {
+ this.onSelectBridgeOption(this._bridgeSelectionRadiogroup.value);
+ } else {
+ this.onSelectBridgeOption(TorBridgeSource.NONE);
+ }
+ return this;
+ },
+
+ // callback when a bridge option is selected
+ onSelectBridgeOption(source) {
+ // disable all of the bridge elements under radio buttons
+ this._setElementsDisabled(
+ [
+ this._builtinBridgeMenulist,
+ this._requestBridgeButton,
+ this._requestBridgeTextarea,
+ this._provideBridgeTextarea,
+ ],
+ true
+ );
+
+ if (source != TorBridgeSource.NONE) {
+ this._bridgeSelectionRadiogroup.value = source;
+ }
+
+ switch (source) {
+ case TorBridgeSource.BUILTIN: {
+ this._setElementsDisabled([this._builtinBridgeMenulist], false);
+ break;
+ }
+ case TorBridgeSource.BRIDGEDB: {
+ this._setElementsDisabled(
+ [this._requestBridgeButton, this._requestBridgeTextarea],
+ false
+ );
+ break;
+ }
+ case TorBridgeSource.USERPROVIDED: {
+ this._setElementsDisabled([this._provideBridgeTextarea], false);
+ break;
+ }
+ }
+ return this;
+ },
+
+ // called when the request bridge button is activated
+ onRequestBridge() {
+ let requestBridgeDialog = new RequestBridgeDialog();
+ requestBridgeDialog.openDialog(
+ gSubDialog,
+ this._proxySettings.proxyURI,
+ aBridges => {
+ if (aBridges.length > 0) {
+ let bridgeSettings = makeTorBridgeSettingsBridgeDB(aBridges);
+ bridgeSettings.writeSettings();
+ this._bridgeSettings = bridgeSettings;
+
+ this._requestBridgeTextarea.value = bridgeSettings.bridgeStrings;
+ }
+ }
+ );
+ return this;
+ },
+
+ // pushes bridge settings from UI to tor
+ onUpdateBridgeSettings() {
+ let bridgeSettings = null;
+
+ let source = this._useBridgeCheckbox.checked
+ ? this._bridgeSelectionRadiogroup.value
+ : TorBridgeSource.NONE;
+ switch (source) {
+ case TorBridgeSource.NONE: {
+ bridgeSettings = makeTorBridgeSettingsNone();
+ break;
+ }
+ case TorBridgeSource.BUILTIN: {
+ // if there is a built-in bridge already selected, use that
+ let bridgeType = this._builtinBridgeMenulist.value;
+ if (bridgeType) {
+ bridgeSettings = makeTorBridgeSettingsBuiltin(bridgeType);
+ } else {
+ bridgeSettings = makeTorBridgeSettingsNone();
+ }
+ break;
+ }
+ case TorBridgeSource.BRIDGEDB: {
+ // if there are bridgedb bridges saved in the text area, use them
+ let bridgeStrings = this._requestBridgeTextarea.value;
+ if (bridgeStrings) {
+ let bridgeStringList = parseBridgeStrings(bridgeStrings);
+ bridgeSettings = makeTorBridgeSettingsBridgeDB(bridgeStringList);
+ } else {
+ bridgeSettings = makeTorBridgeSettingsNone();
+ }
+ break;
+ }
+ case TorBridgeSource.USERPROVIDED: {
+ // if bridges already exist in the text area, use them
+ let bridgeStrings = this._provideBridgeTextarea.value;
+ if (bridgeStrings) {
+ let bridgeStringList = parseBridgeStrings(bridgeStrings);
+ bridgeSettings = makeTorBridgeSettingsUserProvided(
+ bridgeStringList
+ );
+ } else {
+ bridgeSettings = makeTorBridgeSettingsNone();
+ }
+ break;
+ }
+ }
+ bridgeSettings.writeSettings();
+ this._bridgeSettings = bridgeSettings;
+ return this;
+ },
+
+ // callback when proxy is toggled
+ onToggleProxy(enabled) {
+ this._useProxyCheckbox.checked = enabled;
+ let disabled = !enabled;
+
+ this._setElementsDisabled(
+ [
+ this._proxyTypeLabel,
+ this._proxyTypeMenulist,
+ this._proxyAddressLabel,
+ this._proxyAddressTextbox,
+ this._proxyPortLabel,
+ this._proxyPortTextbox,
+ this._proxyUsernameLabel,
+ this._proxyUsernameTextbox,
+ this._proxyPasswordLabel,
+ this._proxyPasswordTextbox,
+ ],
+ disabled
+ );
+ this.onSelectProxyType(this._proxyTypeMenulist.value);
+ return this;
+ },
+
+ // callback when proxy type is changed
+ onSelectProxyType(value) {
+ if (value == "") {
+ value = TorProxyType.NONE;
+ }
+ this._proxyTypeMenulist.value = value;
+ switch (value) {
+ case TorProxyType.NONE: {
+ this._setElementsDisabled(
+ [
+ this._proxyAddressLabel,
+ this._proxyAddressTextbox,
+ this._proxyPortLabel,
+ this._proxyPortTextbox,
+ this._proxyUsernameLabel,
+ this._proxyUsernameTextbox,
+ this._proxyPasswordLabel,
+ this._proxyPasswordTextbox,
+ ],
+ true
+ ); // DISABLE
+
+ this._proxyAddressTextbox.value = "";
+ this._proxyPortTextbox.value = "";
+ this._proxyUsernameTextbox.value = "";
+ this._proxyPasswordTextbox.value = "";
+ break;
+ }
+ case TorProxyType.SOCKS4: {
+ this._setElementsDisabled(
+ [
+ this._proxyAddressLabel,
+ this._proxyAddressTextbox,
+ this._proxyPortLabel,
+ this._proxyPortTextbox,
+ ],
+ false
+ ); // ENABLE
+ this._setElementsDisabled(
+ [
+ this._proxyUsernameLabel,
+ this._proxyUsernameTextbox,
+ this._proxyPasswordLabel,
+ this._proxyPasswordTextbox,
+ ],
+ true
+ ); // DISABLE
+
+ this._proxyUsernameTextbox.value = "";
+ this._proxyPasswordTextbox.value = "";
+ break;
+ }
+ case TorProxyType.SOCKS5:
+ case TorProxyType.HTTPS: {
+ this._setElementsDisabled(
+ [
+ this._proxyAddressLabel,
+ this._proxyAddressTextbox,
+ this._proxyPortLabel,
+ this._proxyPortTextbox,
+ this._proxyUsernameLabel,
+ this._proxyUsernameTextbox,
+ this._proxyPasswordLabel,
+ this._proxyPasswordTextbox,
+ ],
+ false
+ ); // ENABLE
+ break;
+ }
+ }
+ return this;
+ },
+
+ // pushes proxy settings from UI to tor
+ onUpdateProxySettings() {
+ const proxyType = this._useProxyCheckbox.checked
+ ? this._proxyTypeMenulist.value
+ : TorProxyType.NONE;
+ const addressString = this._proxyAddressTextbox.value;
+ const portString = this._proxyPortTextbox.value;
+ const usernameString = this._proxyUsernameTextbox.value;
+ const passwordString = this._proxyPasswordTextbox.value;
+
+ let proxySettings = null;
+
+ switch (proxyType) {
+ case TorProxyType.NONE:
+ proxySettings = makeTorProxySettingsNone();
+ break;
+ case TorProxyType.SOCKS4:
+ proxySettings = makeTorProxySettingsSocks4(
+ addressString,
+ parsePort(portString)
+ );
+ break;
+ case TorProxyType.SOCKS5:
+ proxySettings = makeTorProxySettingsSocks5(
+ addressString,
+ parsePort(portString),
+ usernameString,
+ passwordString
+ );
+ break;
+ case TorProxyType.HTTPS:
+ proxySettings = makeTorProxySettingsHTTPS(
+ addressString,
+ parsePort(portString),
+ usernameString,
+ passwordString
+ );
+ break;
+ }
+
+ proxySettings.writeSettings();
+ this._proxySettings = proxySettings;
+ return this;
+ },
+
+ // callback when firewall proxy is toggled
+ onToggleFirewall(enabled) {
+ this._useFirewallCheckbox.checked = enabled;
+ let disabled = !enabled;
+
+ this._setElementsDisabled(
+ [this._allowedPortsLabel, this._allowedPortsTextbox],
+ disabled
+ );
+
+ return this;
+ },
+
+ // pushes firewall settings from UI to tor
+ onUpdateFirewallSettings() {
+ let portListString = this._useFirewallCheckbox.checked
+ ? this._allowedPortsTextbox.value
+ : "";
+ let firewallSettings = null;
+
+ if (portListString) {
+ firewallSettings = makeTorFirewallSettingsCustom(
+ parsePortList(portListString)
+ );
+ } else {
+ firewallSettings = makeTorFirewallSettingsNone();
+ }
+
+ firewallSettings.writeSettings();
+ this._firewallSettings = firewallSettings;
+ return this;
+ },
+
+ onViewTorLogs() {
+ let torLogDialog = new TorLogDialog();
+ torLogDialog.openDialog(gSubDialog);
+ },
+ };
+ return retval;
+})(); /* gTorPane */
diff --git a/browser/components/torpreferences/content/torPane.xhtml b/browser/components/torpreferences/content/torPane.xhtml
new file mode 100644
index 000000000000..3c966b2b3726
--- /dev/null
+++ b/browser/components/torpreferences/content/torPane.xhtml
@@ -0,0 +1,123 @@
+<!-- Tor panel -->
+
+<script type="application/javascript"
+ src="chrome://browser/content/torpreferences/torPane.js"/>
+<html:template id="template-paneTor">
+<hbox id="torPreferencesCategory"
+ class="subcategory"
+ data-category="paneTor"
+ hidden="true">
+ <html:h1 id="torPreferences-header"/>
+</hbox>
+
+<groupbox data-category="paneTor"
+ hidden="true">
+ <description flex="1">
+ <html:span id="torPreferences-description" class="tail-with-learn-more"/>
+ <label id="torPreferences-learnMore" class="learnMore text-link" is="text-link"/>
+ </description>
+</groupbox>
+
+<!-- Bridges -->
+<groupbox id="torPreferences-bridges-group"
+ data-category="paneTor"
+ hidden="true">
+ <html:h2 id="torPreferences-bridges-header"/>
+ <description flex="1">
+ <html:span id="torPreferences-bridges-description" class="tail-with-learn-more"/>
+ <label id="torPreferences-bridges-learnMore" class="learnMore text-link" is="text-link"/>
+ </description>
+ <checkbox id="torPreferences-bridges-toggle"/>
+ <radiogroup id="torPreferences-bridges-bridgeSelection">
+ <hbox class="indent">
+ <radio id="torPreferences-bridges-radioBuiltin"/>
+ <spacer flex="1"/>
+ <menulist id="torPreferences-bridges-builtinList" class="torMarginFix">
+ <menupopup/>
+ </menulist>
+ </hbox>
+ <vbox class="indent">
+ <hbox>
+ <radio id="torPreferences-bridges-radioRequestBridge"/>
+ <space flex="1"/>
+ <button id="torPreferences-bridges-buttonRequestBridge" class="torMarginFix"/>
+ </hbox>
+ <html:textarea
+ id="torPreferences-bridges-textareaRequestBridge"
+ class="indent torMarginFix"
+ multiline="true"
+ rows="3"
+ readonly="true"/>
+ </vbox>
+ <hbox class="indent" flex="1">
+ <vbox flex="1">
+ <radio id="torPreferences-bridges-radioProvideBridge"/>
+ <description id="torPreferences-bridges-descriptionProvideBridge" class="indent"/>
+ <html:textarea
+ id="torPreferences-bridges-textareaProvideBridge"
+ class="indent torMarginFix"
+ multiline="true"
+ rows="3"/>
+ </vbox>
+ </hbox>
+ </radiogroup>
+</groupbox>
+
+<!-- Advanced -->
+<groupbox id="torPreferences-advanced-group"
+ data-category="paneTor"
+ hidden="true">
+ <html:h2 id="torPreferences-advanced-header"/>
+ <description flex="1">
+ <html:span id="torPreferences-advanced-description" class="tail-with-learn-more"/>
+ <label id="torPreferences-advanced-learnMore" class="learnMore text-link" is="text-link" style="display:none"/>
+ </description>
+ <box id="torPreferences-advanced-grid">
+ <!-- Local Proxy -->
+ <hbox class="torPreferences-advanced-checkbox-container">
+ <checkbox id="torPreferences-advanced-toggleProxy"/>
+ </hbox>
+ <hbox class="indent" align="center">
+ <label id="torPreferences-localProxy-type"/>
+ </hbox>
+ <hbox align="center">
+ <spacer flex="1"/>
+ <menulist id="torPreferences-localProxy-builtinList" class="torMarginFix">
+ <menupopup/>
+ </menulist>
+ </hbox>
+ <hbox class="indent" align="center">
+ <label id="torPreferences-localProxy-address"/>
+ </hbox>
+ <hbox align="center">
+ <html:input id="torPreferences-localProxy-textboxAddress" type="text" class="torMarginFix"/>
+ <label id="torPreferences-localProxy-port"/>
+ <!-- proxy-port-input class style pulled from preferences.css and used in the vanilla proxy setup menu -->
+ <html:input id="torPreferences-localProxy-textboxPort" class="proxy-port-input torMarginFix" hidespinbuttons="true" type="number" min="0" max="65535" maxlength="5"/>
+ </hbox>
+ <hbox class="indent" align="center">
+ <label id="torPreferences-localProxy-username"/>
+ </hbox>
+ <hbox align="center">
+ <html:input id="torPreferences-localProxy-textboxUsername" type="text" class="torMarginFix"/>
+ <label id="torPreferences-localProxy-password"/>
+ <html:input id="torPreferences-localProxy-textboxPassword" class="torMarginFix" type="password"/>
+ </hbox>
+ <!-- Firewall -->
+ <hbox class="torPreferences-advanced-checkbox-container">
+ <checkbox id="torPreferences-advanced-toggleFirewall"/>
+ </hbox>
+ <hbox class="indent" align="center">
+ <label id="torPreferences-advanced-allowedPorts"/>
+ </hbox>
+ <hbox align="center">
+ <html:input id="torPreferences-advanced-textboxAllowedPorts" type="text" class="torMarginFix" value="80,443"/>
+ </hbox>
+ </box>
+ <hbox id="torPreferences-torDaemon-hbox" align="center">
+ <label id="torPreferences-torLogs"/>
+ <spacer flex="1"/>
+ <button id="torPreferences-buttonTorLogs" class="torMarginFix"/>
+ </hbox>
+</groupbox>
+</html:template>
\ No newline at end of file
diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css
new file mode 100644
index 000000000000..4dac2c457823
--- /dev/null
+++ b/browser/components/torpreferences/content/torPreferences.css
@@ -0,0 +1,77 @@
+#category-tor > .category-icon {
+ list-style-image: url("chrome://browser/content/torpreferences/torPreferencesIcon.svg");
+}
+
+#torPreferences-advanced-grid {
+ display: grid;
+ grid-template-columns: auto 1fr;
+}
+
+.torPreferences-advanced-checkbox-container {
+ grid-column: 1 / 3;
+}
+
+#torPreferences-localProxy-textboxAddress,
+#torPreferences-localProxy-textboxUsername,
+#torPreferences-localProxy-textboxPassword,
+#torPreferences-advanced-textboxAllowedPorts {
+ -moz-box-flex: 1;
+}
+
+hbox#torPreferences-torDaemon-hbox {
+ margin-top: 20px;
+}
+
+description#torPreferences-requestBridge-description {
+ /*margin-bottom: 1em;*/
+ min-height: 2em;
+}
+
+image#torPreferences-requestBridge-captchaImage {
+ margin: 1em;
+ min-height: 125px;
+}
+
+button#torPreferences-requestBridge-refreshCaptchaButton {
+ min-width: initial;
+}
+
+dialog#torPreferences-requestBridge-dialog > hbox {
+ margin-bottom: 1em;
+}
+
+/*
+ Various elements that really should be lining up don't because they have inconsistent margins
+*/
+.torMarginFix {
+ margin-left : 4px;
+ margin-right : 4px;
+}
+
+/*
+ This hbox is hidden by css here by default so that the
+ xul dialog allocates enough screen space for the error message
+ element, otherwise it gets cut off since dialog's overflow is hidden
+*/
+hbox#torPreferences-requestBridge-incorrectCaptchaHbox {
+ visibility: hidden;
+}
+
+image#torPreferences-requestBridge-errorIcon {
+ list-style-image: url("chrome://browser/skin/warning.svg");
+}
+
+groupbox#torPreferences-bridges-group textarea {
+ white-space: pre;
+ overflow: auto;
+}
+
+textarea#torPreferences-torDialog-textarea {
+ -moz-box-flex: 1;
+ font-family: monospace;
+ font-size: 0.8em;
+ white-space: pre;
+ overflow: auto;
+ /* 10 lines */
+ min-height: 20em;
+}
\ No newline at end of file
diff --git a/browser/components/torpreferences/content/torPreferencesIcon.svg b/browser/components/torpreferences/content/torPreferencesIcon.svg
new file mode 100644
index 000000000000..d7895f1107c5
--- /dev/null
+++ b/browser/components/torpreferences/content/torPreferencesIcon.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <g fill="context-fill" fill-opacity="context-fill-opacity" fill-rule="nonzero">
+ <path d="M12.0246161,21.8174863 L12.0246161,20.3628098 C16.6324777,20.3495038 20.3634751,16.6108555 20.3634751,11.9996673 C20.3634751,7.38881189 16.6324777,3.65016355 12.0246161,3.63685757 L12.0246161,2.18218107 C17.4358264,2.1958197 21.8178189,6.58546322 21.8178189,11.9996673 C21.8178189,17.4142042 17.4358264,21.8041803 12.0246161,21.8174863 L12.0246161,21.8174863 Z M12.0246161,16.7259522 C14.623607,16.7123136 16.7272828,14.6023175 16.7272828,11.9996673 C16.7272828,9.39734991 14.623607,7.28735377 12.0246161,7.27371516 L12.0246161,5.81937131 C15.4272884,5.8326773 18.1819593,8.59400123 18.1819593,11.9996673 C18.1819593,15.4056661 15.4272884,18.1669901 12.0246161,18.1802961 L12.0246161,16.7259522 Z M12.0246161,9.45556355 C13.4187503,9.46886953 14.5454344,10.6022066 14.5454344,11.9996673 C14.5454344,13.3974608 13.4187503,14.5307978 12.0246161,14.5441038 L12.0246161,9.45556355 Z M0,11.9996673 C0,18.6273771 5.37229031,24 12,24 C18.6273771,24 24,18.6273771 24,11.9996673 C24,5.37229031
18.6273771,0 12,0 C5.37229031,0 0,5.37229031 0,11.9996673 Z"/>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/browser/components/torpreferences/content/torProxySettings.jsm b/browser/components/torpreferences/content/torProxySettings.jsm
new file mode 100644
index 000000000000..98bb5e8d5cbf
--- /dev/null
+++ b/browser/components/torpreferences/content/torProxySettings.jsm
@@ -0,0 +1,245 @@
+"use strict";
+
+var EXPORTED_SYMBOLS = [
+ "TorProxyType",
+ "TorProxySettings",
+ "makeTorProxySettingsNone",
+ "makeTorProxySettingsSocks4",
+ "makeTorProxySettingsSocks5",
+ "makeTorProxySettingsHTTPS",
+];
+
+const { TorProtocolService } = ChromeUtils.import(
+ "resource:///modules/TorProtocolService.jsm"
+);
+const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");
+const { parseAddrPort, parseUsernamePassword } = ChromeUtils.import(
+ "chrome://browser/content/torpreferences/parseFunctions.jsm"
+);
+
+const TorProxyType = {
+ NONE: "NONE",
+ SOCKS4: "SOCKS4",
+ SOCKS5: "SOCKS5",
+ HTTPS: "HTTPS",
+};
+
+class TorProxySettings {
+ constructor() {
+ this._proxyType = TorProxyType.NONE;
+ this._proxyAddress = undefined;
+ this._proxyPort = undefined;
+ this._proxyUsername = undefined;
+ this._proxyPassword = undefined;
+ }
+
+ get type() {
+ return this._proxyType;
+ }
+ get address() {
+ return this._proxyAddress;
+ }
+ get port() {
+ return this._proxyPort;
+ }
+ get username() {
+ return this._proxyUsername;
+ }
+ get password() {
+ return this._proxyPassword;
+ }
+ get proxyURI() {
+ switch (this._proxyType) {
+ case TorProxyType.SOCKS4:
+ return `socks4a://${this._proxyAddress}:${this._proxyPort}`;
+ case TorProxyType.SOCKS5:
+ if (this._proxyUsername) {
+ return `socks5://${this._proxyUsername}:${this._proxyPassword}@${
+ this._proxyAddress
+ }:${this._proxyPort}`;
+ }
+ return `socks5://${this._proxyAddress}:${this._proxyPort}`;
+ case TorProxyType.HTTPS:
+ if (this._proxyUsername) {
+ return `http://${this._proxyUsername}:${this._proxyPassword}@${
+ this._proxyAddress
+ }:${this._proxyPort}`;
+ }
+ return `http://${this._proxyAddress}:${this._proxyPort}`;
+ }
+ return undefined;
+ }
+
+ // attempts to read proxy settings from Tor daemon
+ readSettings() {
+ // SOCKS4
+ {
+ let addressPort = TorProtocolService.readStringSetting(
+ TorStrings.configKeys.socks4Proxy
+ );
+ if (addressPort) {
+ // address+port
+ let [proxyAddress, proxyPort] = parseAddrPort(addressPort);
+
+ this._proxyType = TorProxyType.SOCKS4;
+ this._proxyAddress = proxyAddress;
+ this._proxyPort = proxyPort;
+ this._proxyUsername = "";
+ this._proxyPassword = "";
+
+ return;
+ }
+ }
+
+ // SOCKS5
+ {
+ let addressPort = TorProtocolService.readStringSetting(
+ TorStrings.configKeys.socks5Proxy
+ );
+
+ if (addressPort) {
+ // address+port
+ let [proxyAddress, proxyPort] = parseAddrPort(addressPort);
+ // username
+ let proxyUsername = TorProtocolService.readStringSetting(
+ TorStrings.configKeys.socks5ProxyUsername
+ );
+ // password
+ let proxyPassword = TorProtocolService.readStringSetting(
+ TorStrings.configKeys.socks5ProxyPassword
+ );
+
+ this._proxyType = TorProxyType.SOCKS5;
+ this._proxyAddress = proxyAddress;
+ this._proxyPort = proxyPort;
+ this._proxyUsername = proxyUsername;
+ this._proxyPassword = proxyPassword;
+
+ return;
+ }
+ }
+
+ // HTTP
+ {
+ let addressPort = TorProtocolService.readStringSetting(
+ TorStrings.configKeys.httpsProxy
+ );
+
+ if (addressPort) {
+ // address+port
+ let [proxyAddress, proxyPort] = parseAddrPort(addressPort);
+
+ // username:password
+ let proxyAuthenticator = TorProtocolService.readStringSetting(
+ TorStrings.configKeys.httpsProxyAuthenticator
+ );
+
+ let [proxyUsername, proxyPassword] = ["", ""];
+ if (proxyAuthenticator) {
+ [proxyUsername, proxyPassword] = parseUsernamePassword(
+ proxyAuthenticator
+ );
+ }
+
+ this._proxyType = TorProxyType.HTTPS;
+ this._proxyAddress = proxyAddress;
+ this._proxyPort = proxyPort;
+ this._proxyUsername = proxyUsername;
+ this._proxyPassword = proxyPassword;
+ }
+ }
+ // no proxy settings
+ } /* TorProxySettings::ReadFromTor() */
+
+ // attempts to write proxy settings to Tor daemon
+ // throws on error
+ writeSettings() {
+ let settingsObject = new Map();
+
+ // init proxy related settings to null so Tor daemon resets them
+ settingsObject.set(TorStrings.configKeys.socks4Proxy, null);
+ settingsObject.set(TorStrings.configKeys.socks5Proxy, null);
+ settingsObject.set(TorStrings.configKeys.socks5ProxyUsername, null);
+ settingsObject.set(TorStrings.configKeys.socks5ProxyPassword, null);
+ settingsObject.set(TorStrings.configKeys.httpsProxy, null);
+ settingsObject.set(TorStrings.configKeys.httpsProxyAuthenticator, null);
+
+ switch (this._proxyType) {
+ case TorProxyType.SOCKS4:
+ settingsObject.set(
+ TorStrings.configKeys.socks4Proxy,
+ `${this._proxyAddress}:${this._proxyPort}`
+ );
+ break;
+ case TorProxyType.SOCKS5:
+ settingsObject.set(
+ TorStrings.configKeys.socks5Proxy,
+ `${this._proxyAddress}:${this._proxyPort}`
+ );
+ settingsObject.set(
+ TorStrings.configKeys.socks5ProxyUsername,
+ this._proxyUsername
+ );
+ settingsObject.set(
+ TorStrings.configKeys.socks5ProxyPassword,
+ this._proxyPassword
+ );
+ break;
+ case TorProxyType.HTTPS:
+ settingsObject.set(
+ TorStrings.configKeys.httpsProxy,
+ `${this._proxyAddress}:${this._proxyPort}`
+ );
+ settingsObject.set(
+ TorStrings.configKeys.httpsProxyAuthenticator,
+ `${this._proxyUsername}:${this._proxyPassword}`
+ );
+ break;
+ }
+
+ TorProtocolService.writeSettings(settingsObject);
+ } /* TorProxySettings::WriteToTor() */
+}
+
+// factory methods for our various supported proxies
+function makeTorProxySettingsNone() {
+ return new TorProxySettings();
+}
+
+function makeTorProxySettingsSocks4(aProxyAddress, aProxyPort) {
+ let retval = new TorProxySettings();
+ retval._proxyType = TorProxyType.SOCKS4;
+ retval._proxyAddress = aProxyAddress;
+ retval._proxyPort = aProxyPort;
+ return retval;
+}
+
+function makeTorProxySettingsSocks5(
+ aProxyAddress,
+ aProxyPort,
+ aProxyUsername,
+ aProxyPassword
+) {
+ let retval = new TorProxySettings();
+ retval._proxyType = TorProxyType.SOCKS5;
+ retval._proxyAddress = aProxyAddress;
+ retval._proxyPort = aProxyPort;
+ retval._proxyUsername = aProxyUsername;
+ retval._proxyPassword = aProxyPassword;
+ return retval;
+}
+
+function makeTorProxySettingsHTTPS(
+ aProxyAddress,
+ aProxyPort,
+ aProxyUsername,
+ aProxyPassword
+) {
+ let retval = new TorProxySettings();
+ retval._proxyType = TorProxyType.HTTPS;
+ retval._proxyAddress = aProxyAddress;
+ retval._proxyPort = aProxyPort;
+ retval._proxyUsername = aProxyUsername;
+ retval._proxyPassword = aProxyPassword;
+ return retval;
+}
diff --git a/browser/components/torpreferences/jar.mn b/browser/components/torpreferences/jar.mn
new file mode 100644
index 000000000000..857bc9ee3eac
--- /dev/null
+++ b/browser/components/torpreferences/jar.mn
@@ -0,0 +1,14 @@
+browser.jar:
+ content/browser/torpreferences/parseFunctions.jsm (content/parseFunctions.jsm)
+ content/browser/torpreferences/requestBridgeDialog.xhtml (content/requestBridgeDialog.xhtml)
+ content/browser/torpreferences/requestBridgeDialog.jsm (content/requestBridgeDialog.jsm)
+ content/browser/torpreferences/torBridgeSettings.jsm (content/torBridgeSettings.jsm)
+ content/browser/torpreferences/torCategory.inc.xhtml (content/torCategory.inc.xhtml)
+ content/browser/torpreferences/torFirewallSettings.jsm (content/torFirewallSettings.jsm)
+ content/browser/torpreferences/torLogDialog.jsm (content/torLogDialog.jsm)
+ content/browser/torpreferences/torLogDialog.xhtml (content/torLogDialog.xhtml)
+ content/browser/torpreferences/torPane.js (content/torPane.js)
+ content/browser/torpreferences/torPane.xhtml (content/torPane.xhtml)
+ content/browser/torpreferences/torPreferences.css (content/torPreferences.css)
+ content/browser/torpreferences/torPreferencesIcon.svg (content/torPreferencesIcon.svg)
+ content/browser/torpreferences/torProxySettings.jsm (content/torProxySettings.jsm)
diff --git a/browser/components/torpreferences/moz.build b/browser/components/torpreferences/moz.build
new file mode 100644
index 000000000000..2661ad7cb9f3
--- /dev/null
+++ b/browser/components/torpreferences/moz.build
@@ -0,0 +1 @@
+JAR_MANIFESTS += ["jar.mn"]
diff --git a/browser/modules/BridgeDB.jsm b/browser/modules/BridgeDB.jsm
new file mode 100644
index 000000000000..2caa26b4e2e0
--- /dev/null
+++ b/browser/modules/BridgeDB.jsm
@@ -0,0 +1,110 @@
+"use strict";
+
+var EXPORTED_SYMBOLS = ["BridgeDB"];
+
+const { TorLauncherBridgeDB } = ChromeUtils.import(
+ "resource://torlauncher/modules/tl-bridgedb.jsm"
+);
+const { TorProtocolService } = ChromeUtils.import(
+ "resource:///modules/TorProtocolService.jsm"
+);
+const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm");
+
+var BridgeDB = {
+ _moatRequestor: null,
+ _currentCaptchaInfo: null,
+ _bridges: null,
+
+ get currentCaptchaImage() {
+ if (this._currentCaptchaInfo) {
+ return this._currentCaptchaInfo.captchaImage;
+ }
+ return null;
+ },
+
+ get currentBridges() {
+ return this._bridges;
+ },
+
+ submitCaptchaGuess(aCaptchaSolution) {
+ if (this._moatRequestor && this._currentCaptchaInfo) {
+ return this._moatRequestor
+ .finishFetch(
+ this._currentCaptchaInfo.transport,
+ this._currentCaptchaInfo.challenge,
+ aCaptchaSolution
+ )
+ .then(aBridgeInfo => {
+ this._moatRequestor.close();
+ this._moatRequestor = null;
+ this._currentCaptchaInfo = null;
+ this._bridges = aBridgeInfo.bridges;
+ // array of bridge strings
+ return this._bridges;
+ });
+ }
+
+ return new Promise((aResponse, aReject) => {
+ aReject(new Error("Invalid _moatRequestor or _currentCaptchaInfo"));
+ });
+ },
+
+ requestNewCaptchaImage(aProxyURI) {
+ // close and clear out existing state on captcha request
+ this.close();
+
+ let transportPlugins = TorProtocolService.readStringArraySetting(
+ TorStrings.configKeys.clientTransportPlugin
+ );
+
+ let meekClientPath;
+ let meekTransport; // We support both "meek" and "meek_lite".
+ let meekClientArgs;
+ // TODO: shouldn't this early out once meek settings are found?
+ for (const line of transportPlugins) {
+ // Parse each ClientTransportPlugin line and look for the meek or
+ // meek_lite transport. This code works a lot like the Tor daemon's
+ // parse_transport_line() function.
+ let tokens = line.split(" ");
+ if (tokens.length > 2 && tokens[1] == "exec") {
+ let transportArray = tokens[0].split(",").map(aStr => aStr.trim());
+ let transport = transportArray.find(
+ aTransport => aTransport === "meek"
+ );
+ if (!transport) {
+ transport = transportArray.find(
+ aTransport => aTransport === "meek_lite"
+ );
+ }
+ if (transport) {
+ meekTransport = transport;
+ meekClientPath = tokens[2];
+ meekClientArgs = tokens.slice(3);
+ }
+ }
+ }
+
+ this._moatRequestor = TorLauncherBridgeDB.createMoatRequestor();
+
+ return this._moatRequestor
+ .init(aProxyURI, meekTransport, meekClientPath, meekClientArgs)
+ .then(() => {
+ // TODO: get this from TorLauncherUtil
+ let bridgeType = "obfs4";
+ return this._moatRequestor.fetchBridges([bridgeType]);
+ })
+ .then(aCaptchaInfo => {
+ // cache off the current captcha info as the challenge is needed for response
+ this._currentCaptchaInfo = aCaptchaInfo;
+ return aCaptchaInfo.captchaImage;
+ });
+ },
+
+ close() {
+ if (this._moatRequestor) {
+ this._moatRequestor.close();
+ this._moatRequestor = null;
+ }
+ this._currentCaptchaInfo = null;
+ },
+};
diff --git a/browser/modules/TorProtocolService.jsm b/browser/modules/TorProtocolService.jsm
new file mode 100644
index 000000000000..b4e6ed9a3253
--- /dev/null
+++ b/browser/modules/TorProtocolService.jsm
@@ -0,0 +1,212 @@
+"use strict";
+
+var EXPORTED_SYMBOLS = ["TorProtocolService"];
+
+const { TorLauncherUtil } = ChromeUtils.import(
+ "resource://torlauncher/modules/tl-util.jsm"
+);
+
+var TorProtocolService = {
+ _tlps: Cc["@torproject.org/torlauncher-protocol-service;1"].getService(
+ Ci.nsISupports
+ ).wrappedJSObject,
+
+ // 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(),
+
+ _typeof(aValue) {
+ switch (typeof aValue) {
+ case "boolean":
+ return "boolean";
+ case "string":
+ return "string";
+ case "object":
+ if (aValue == null) {
+ return "null";
+ } else if (Array.isArray(aValue)) {
+ return "array";
+ }
+ return "object";
+ }
+ return "unknown";
+ },
+
+ _assertValidSettingKey(aSetting) {
+ // ensure the 'key' is a string
+ if (typeof aSetting != "string") {
+ throw new Error(
+ `Expected setting of type string but received ${typeof aSetting}`
+ );
+ }
+ },
+
+ _assertValidSetting(aSetting, aValue) {
+ this._assertValidSettingKey(aSetting);
+
+ const valueType = this._typeof(aValue);
+ switch (valueType) {
+ case "boolean":
+ case "string":
+ case "null":
+ return;
+ case "array":
+ for (const element of aValue) {
+ if (typeof element != "string") {
+ throw new Error(
+ `Setting '${aSetting}' array contains value of invalid type '${typeof element}'`
+ );
+ }
+ }
+ return;
+ default:
+ throw new Error(
+ `Invalid object type received for setting '${aSetting}'`
+ );
+ }
+ },
+
+ // takes a Map containing tor settings
+ // throws on error
+ writeSettings(aSettingsObj) {
+ // only write settings that have changed
+ let newSettings = new Map();
+ for (const [setting, value] of aSettingsObj) {
+ let saveSetting = false;
+
+ // make sure we have valid data here
+ this._assertValidSetting(setting, value);
+
+ if (!this._settingsCache.has(setting)) {
+ // no cached setting, so write
+ saveSetting = true;
+ } else {
+ const cachedValue = this._settingsCache.get(setting);
+ if (value != cachedValue) {
+ // compare arrays member-wise
+ if (Array.isArray(value) && Array.isArray(cachedValue)) {
+ if (value.length != cachedValue.length) {
+ saveSetting = true;
+ } else {
+ const arrayLength = value.length;
+ for (let i = 0; i < arrayLength; ++i) {
+ if (value[i] != cachedValue[i]) {
+ saveSetting = true;
+ break;
+ }
+ }
+ }
+ } else {
+ // some other different values
+ saveSetting = true;
+ }
+ }
+ }
+
+ if (saveSetting) {
+ newSettings.set(setting, value);
+ }
+ }
+
+ // only write if new setting to save
+ if (newSettings.size > 0) {
+ // convert settingsObject map to js object for torlauncher-protocol-service
+ let settingsObject = {};
+ for (const [setting, value] of newSettings) {
+ settingsObject[setting] = value;
+ }
+
+ let errorObject = {};
+ if (!this._tlps.TorSetConfWithReply(settingsObject, errorObject)) {
+ throw new Error(errorObject.details);
+ }
+
+ // save settings to cache after successfully writing to Tor
+ for (const [setting, value] of newSettings) {
+ this._settingsCache.set(setting, value);
+ }
+ }
+ },
+
+ _readSetting(aSetting) {
+ this._assertValidSettingKey(aSetting);
+ let reply = this._tlps.TorGetConf(aSetting);
+ if (this._tlps.TorCommandSucceeded(reply)) {
+ return reply.lineArray;
+ }
+ throw new Error(reply.lineArray.join("\n"));
+ },
+
+ _readBoolSetting(aSetting) {
+ let lineArray = this._readSetting(aSetting);
+ if (lineArray.length != 1) {
+ throw new Error(
+ `Expected an array with length 1 but received array of length ${
+ lineArray.length
+ }`
+ );
+ }
+
+ let retval = lineArray[0];
+ switch (retval) {
+ case "0":
+ return false;
+ case "1":
+ return true;
+ default:
+ throw new Error(`Expected boolean (1 or 0) but received '${retval}'`);
+ }
+ },
+
+ _readStringSetting(aSetting) {
+ let lineArray = this._readSetting(aSetting);
+ if (lineArray.length != 1) {
+ throw new Error(
+ `Expected an array with length 1 but received array of length ${
+ lineArray.length
+ }`
+ );
+ }
+ return lineArray[0];
+ },
+
+ _readStringArraySetting(aSetting) {
+ let lineArray = this._readSetting(aSetting);
+ return lineArray;
+ },
+
+ readBoolSetting(aSetting) {
+ let value = this._readBoolSetting(aSetting);
+ this._settingsCache.set(aSetting, value);
+ return value;
+ },
+
+ readStringSetting(aSetting) {
+ let value = this._readStringSetting(aSetting);
+ this._settingsCache.set(aSetting, value);
+ return value;
+ },
+
+ readStringArraySetting(aSetting) {
+ let value = this._readStringArraySetting(aSetting);
+ this._settingsCache.set(aSetting, value);
+ return value;
+ },
+
+ // writes current tor settings to disk
+ flushSettings() {
+ this._tlps.TorSendCommand("SAVECONF");
+ },
+
+ getLog() {
+ let countObj = { value: 0 };
+ let torLog = this._tlps.TorGetLog(countObj);
+ return torLog;
+ },
+
+ // true if we launched and control tor, false if using system tor
+ get ownsTorDaemon() {
+ return TorLauncherUtil.shouldStartAndOwnTor;
+ },
+};
diff --git a/browser/modules/moz.build b/browser/modules/moz.build
index 3774c12f4ef0..1f7c6bc4c67e 100644
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -128,6 +128,7 @@ EXTRA_JS_MODULES += [
"AboutNewTab.jsm",
"AppUpdater.jsm",
"AsyncTabSwitcher.jsm",
+ "BridgeDB.jsm",
"BrowserUIUtils.jsm",
"BrowserUsageTelemetry.jsm",
"BrowserWindowTracker.jsm",
@@ -152,6 +153,7 @@ EXTRA_JS_MODULES += [
"TabsList.jsm",
"TabUnloader.jsm",
"ThemeVariableMap.jsm",
+ "TorProtocolService.jsm",
"TorStrings.jsm",
"TransientPrefs.jsm",
"webrtcUI.jsm",
1
0