[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
commit 5113c9c34e54f246e1a0e19df56e3104c45bd752 Author: Translation commit bot Date: Wed Apr 21 05:47:05 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es.po | 12 +- contents+hi.po | 814 +++-- 2 files changed, 619 insertions(+), 207 deletions(-) diff --git a/contents+es.po b/contents+es.po index 5145d0814f..19e3c3ef5b 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1977,7 +1977,7 @@ msgid "" "You can further increase your security by choosing to disable certain web " "features that can be used to compromise your security and anonymity." msgstr "" -"Puedes aumentar aún más tu seguridad al elegir deshabilitar ciertas " +"Puedes aumentar aún más tu seguridad si eliges deshabilitar ciertas " "funciones web que se pueden usar para comprometer tu seguridad y anonimato." #: https//tb-manual.torproject.org/security-settings/ @@ -2168,11 +2168,11 @@ msgid "" "indicator when Tor Browser opens. You can update either automatically or " "manually." msgstr "" -"El Navegador Tor te pedirá que actualices el software una vez que haya sido " -"lanzada una nueva versión: el menú de hamburguesa (menú principal) mostrará " -"un cÃrculo verde con una flecha apuntando hacia arriba en él, y podrÃas ver " -"un indicador de actualización escrito cuando se abra el Navegador Tor. " -"Puedes actualizar tanto automática como manualmente." +"El Navegador Tor te pedirá que actualices el software cuando se publique una" +" nueva versión: el menú de hamburguesa (menú principal) mostrará un cÃrculo " +"verde con una flecha apuntando hacia arriba en él, y podrÃas ver un " +"indicador de actualización escrito cuando se abra el Navegador Tor. Puedes " +"actualizar tanto automática como manualmente." #: https//tb-manual.torproject.org/updating/ #: (content/updating/contents+en.lrtopic.body) diff --git a/contents+hi.po b/contents+hi.po index 3d796985d0..e7bc8bd507 100644 --- a/contents+hi.po +++ b/contents+hi.po @@ -3,20 +3,20 @@ # Drashti Pandya , 2018 # Manav Garg , 2019 # erinm, 2019 -# Emma Peel, 2020 # Kalyan Dikshit , 2020 # Mruga Shah , 2020 # Karan S, 2020 # James Bond , 2020 -# Adarsh Bharat , 2020 +# Adarsh Bharat , 2021 +# Emma Peel, 2021 # msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-12 08:00+CET\n" +"POT-Creation-Date: 2021-03-02 09:17+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: Adarsh Bharat , 2020\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Hindi (https://www.transifex.com/otf/teams/1519/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -152,8 +152,6 @@ msgstr "à¤à¥à¤à¤¾à¤¤ पहलà¥" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) -#: https//tb-manual.torproject.org/mobile-tor/ -#: (content/mobile-tor/contents+en.lrtopic.title) msgid "Mobile Tor" msgstr "मà¥à¤¬à¤¾à¤à¤² à¤à¥à¤°" @@ -235,7 +233,7 @@ msgid "" msgstr "" "डिफ़à¥à¤²à¥à¤ रà¥à¤ª सà¥, à¤à¥à¤° बà¥à¤°à¤¾à¤à¤à¤¼à¤° à¤à¥à¤ बà¥à¤°à¤¾à¤à¤à¤¼à¤¿à¤à¤ à¤à¤¤à¤¿à¤¹à¤¾à¤¸ नहà¥à¤ रà¤à¤¤à¤¾ हà¥à¥¤ à¤à¥à¤à¥à¤à¤¼ " "à¤à¥à¤µà¤² à¤à¤ सतà¥à¤° à¤à¥ लिठमानà¥à¤¯ हà¥à¤ (à¤à¤¬ तठà¤à¤¿ à¤à¥à¤° बà¥à¤°à¤¾à¤à¤à¤¼à¤° बाहर न निà¤à¤² à¤à¤¾à¤ या à¤à¤ " -"[नठपहà¤à¤¾à¤¨] (/ पà¥à¤°à¤¬à¤à¤§-पहà¤à¤¾à¤¨ / # नà¤-पहà¤à¤¾à¤¨) à¤à¤¾ ठनà¥à¤°à¥à¤§ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤à¥¤" +"[नठपहà¤à¤¾à¤¨](/managing-identities/#new-identity) à¤à¤¾ ठनà¥à¤°à¥à¤§ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤à¥¤" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) @@ -302,8 +300,8 @@ msgid "" "Your connection to the site will be secured using [HTTPS](/secure-" "connections), which makes it much harder for somebody to tamper with." msgstr "" -"साà¤à¤ पर à¤à¤ªà¤à¤¾ à¤à¤¨à¥à¤à¥à¤¶à¤¨ [HTTPS] (/ सिà¤à¥à¤¯à¥à¤°-à¤à¤¨à¥à¤à¥à¤¶à¤¨) à¤à¤¾ à¤à¤ªà¤¯à¥à¤ à¤à¤°à¤à¥ सà¥à¤°à¤à¥à¤·à¤¿à¤¤ à¤à¤¿à¤¯à¤¾" -" à¤à¤¾à¤à¤à¤¾, à¤à¤¿à¤¸à¤¸à¥ à¤à¤¿à¤¸à¥ à¤à¥ साथ à¤à¥à¤¡à¤¼à¤à¤¾à¤¡à¤¼ à¤à¤°à¤¨à¤¾ मà¥à¤¶à¥à¤à¤¿à¤² हॠà¤à¤¾à¤¤à¤¾ हà¥à¥¤" +"साà¤à¤ पर à¤à¤ªà¤à¤¾ à¤à¤¨à¥à¤à¥à¤¶à¤¨ [HTTPS](/secure-connections) à¤à¤¾ à¤à¤ªà¤¯à¥à¤ à¤à¤°à¤à¥ सà¥à¤°à¤à¥à¤·à¤¿à¤¤ " +"à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤à¤à¤¾, à¤à¤¿à¤¸à¤¸à¥ à¤à¤¿à¤¸à¥ à¤à¥ साथ à¤à¥à¤¡à¤¼à¤à¤¾à¤¡à¤¼ à¤à¤°à¤¨à¤¾ मà¥à¤¶à¥à¤à¤¿à¤² हॠà¤à¤¾à¤¤à¤¾ हà¥à¥¤" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -338,8 +336,9 @@ msgid "" msgstr "" "यदि à¤à¤ª à¤à¥à¤° बà¥à¤°à¤¾à¤à¤à¤¼à¤° à¤à¥ à¤à¤§à¤¿à¤à¤¾à¤°à¤¿à¤ à¤à¥à¤° पà¥à¤°à¥à¤à¥à¤à¥à¤
[tor-commits] [translation/abouttor-homepage_completed] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
commit 3d2975597e3eb8e23fea49b8b93b10a26d38ee38 Author: Translation commit bot Date: Wed Apr 21 05:45:13 2021 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed --- my/aboutTor.dtd | 31 +++ 1 file changed, 31 insertions(+) diff --git a/my/aboutTor.dtd b/my/aboutTor.dtd new file mode 100644 index 00..06bc341034 --- /dev/null +++ b/my/aboutTor.dtd @@ -0,0 +1,31 @@ + + + + + + + + + + + + +https://duckduckgo.com;> + + + + + + + + + + + + + + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [Git][tpo/applications/android-components][android-components-74.0.10-10.5-1] 12 commits: Bug 40005: Modify Default toolbar menu
Matthew Finkel pushed to branch android-components-74.0.10-10.5-1 at The Tor Project / Applications / android-components Commits: f6027eb0 by Matthew Finkel at 2021-04-20T21:37:47+00:00 Bug 40005: Modify Default toolbar menu - - - - - 44807351 by Alex Catarineu at 2021-04-20T21:37:47+00:00 Bug 40007: Port external helper app prompting Together with the corresponding fenix patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. - - - - - 72285226 by Alex Catarineu at 2021-04-20T21:37:47+00:00 Bug 40002: Ensure system download manager is not used - - - - - 6af3b554 by Alex Catarineu at 2021-04-20T21:37:47+00:00 Bug 40009: Change the default search engines This matches the search engines from desktop, that is: DDG as the default, then YouTube, Google, DDGOnion, Startpage, Twitter, Wikipedia and Yahoo. - - - - - cad8e466 by Alex Catarineu at 2021-04-20T21:37:47+00:00 Modify Addon support Bug 40011: Hide option for disallowing addons in private mode Bug 40016: Allow inheriting from AddonCollectionProvider This will allow implementing our own AddonsProvider in fenix. - - - - - e43853a9 by Georg Koppen at 2021-04-20T21:37:47+00:00 Bug 40013: Add option do overwrite timestamp in extension version - - - - - 2a406401 by Alex Catarineu at 2021-04-20T21:37:47+00:00 Bug 40015: Port padlock states for .onion services - - - - - 22e293e9 by Alex Catarineu at 2021-04-20T21:37:47+00:00 Bug 40021: Force telemetry=false in Fennec settings migration - - - - - eeecd91f by Alex Catarineu at 2021-04-20T21:37:47+00:00 Bug 40022: Migrate Tor security level from Fennec - - - - - dc48045f by Matthew Finkel at 2021-04-20T21:37:47+00:00 Modify Tracking Protection configuration Bug 40020: Disable third-party cookies Bug 40024: Disable tracking protection by default - - - - - 78efdf83 by Matthew Finkel at 2021-04-20T21:37:47+00:00 Bug 40023: Stop PrivateNotificationService - - - - - 2c2db7aa by Matthew Finkel at 2021-04-20T21:37:54+00:00 Add support for new GeckoView interfaces Bug 40006: Expose Security Level interface Bug 40019: Expose spoofEnglish pref Bug 34439: Isolate Icon loader on Android - - - - - 30 changed files: - build.gradle - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko-beta/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/fetch/GeckoViewFetchClient.kt - components/browser/icons/src/main/java/mozilla/components/browser/icons/loader/HttpIconLoader.kt - components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt - components/browser/search/src/main/assets/search/list.json - + components/browser/search/src/main/assets/searchplugins/ddg-onion.xml - components/browser/search/src/main/assets/searchplugins/ddg.xml - + components/browser/search/src/main/assets/searchplugins/startpage.xml - + components/browser/search/src/main/assets/searchplugins/yahoo.xml - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/DisplayToolbar.kt - components/browser/toolbar/src/main/java/mozilla/components/browser/toolbar/display/SiteSecurityIconView.kt - components/browser/toolbar/src/main/res/drawable/mozac_ic_site_security.xml - components/browser/toolbar/src/main/res/values/attrs_browser_toolbar.xml - components/concept/engine/src/main/java/mozilla/components/concept/engine/EngineSession.kt - components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - components/concept/fetch/src/main/java/mozilla/components/concept/fetch/Request.kt - components/concept/toolbar/src/main/java/mozilla/components/concept/toolbar/Toolbar.kt - components/feature/addons/src/main/java/mozilla/components/feature/addons/amo/AddonCollectionProvider.kt - components/feature/addons/src/main/res/layout/mozac_feature_addons_fragment_dialog_addon_installed.xml - components/feature/app-links/build.gradle - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksFeature.kt - components/feature/app-links/src/main/java/mozilla/components/feature/app/links/AppLinksUseCases.kt - components/feature/contextmenu/src/main/java/mozilla/components/feature/contextmenu/ContextMenuCandidate.kt - components/feature/downloads/build.gradle - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt - components/feature/downloads/src/main/java/mozilla/components/feature/downloads/DownloadsFeature.kt - components/feature/privatemode/src/main/java/mozilla/components/feature/privatemode/notification/PrivateNotificationFeature.kt The diff was not included because it is too large. View
[tor-commits] [Git][tpo/applications/fenix][tor-browser-88.1.0-10.5-1] 8 commits: Bug 40002: Add GitLab CI
Matthew Finkel pushed to branch tor-browser-88.1.0-10.5-1 at The Tor Project / Applications / fenix Commits: 90e53f2d by Matthew Finkel at 2021-04-20T21:04:09+00:00 Bug 40002: Add GitLab CI Pin CI builds to runners with 32GB of RAM to avoid OOM conditions. - - - - - 2797 by Matthew Finkel at 2021-04-20T21:04:09+00:00 Rename as Tor Browser Bug 40020: Change applicationId Bug 40020: Change app name Bug 40020: Change deeplink scheme Bug 40020: Change App icons Bug 40073: Use correct branding on About page Bug 40088: Use Tor Browser logo in migration screen - - - - - 42131500 by Matthew Finkel at 2021-04-20T21:04:09+00:00 Disable features and functionality Bug 33594: Disable data collection by default (Glean) Bug 40019: Adjust is disabled on Release when data collection is disabled Bug 34338: Disable the crash reporter Bug 40014: Neuter Google Advertising ID Bug 40018: Disable Push service Bug 40034: Disable PWA onboading Bug 40072: Disable Tracking Protection Bug 40061: Do not show Send to device in sharing menu Bug 40109: Reduce requested permissions Exclude LOCATION and NETWORK_STATE - - - - - c80e202d by Georg Koppen at 2021-04-20T21:04:09+00:00 Modify build system Bug 40083: Make locale ordering in BuildConfig deterministic Bug 40042: Add option do overwrite timestamp in extension version Bug 40059: Use MOZ_BUILD_DATE for versionCode At the same time we adapt MOZ_BUILD_DATE to our needs where it is actually used and not in tor-browser-build. This gives us more flexibility. See: tor-browser-build#40084. Bug 40067: Fix reproducibility issue in classes2.dex We make sure our MOZ_BUILD_DATE gets used as a source for showing date related information on the Fenix about page. Bug 40071: Show only supported locales Bug 40064: Use Gecko Beta for Nightly and Debug variants Bug 40123: Allow building the instrumented tests apks for variants other than debug This allows to specify the variant of the instrumented tests via a `testBuildType` gradle argument. It also applies a workaround for a R8 issue from https://issuetracker.google.com/issues/140851070. Bug 40143: Use deterministic date in Test apk The build config was using Date() when generating the Test apks versionName. - - - - - efae7ebb by Matthew Finkel at 2021-04-20T21:04:09+00:00 Add Tor integration and UI Bug 40001: Start Tor as part of the Fenix initialization Bug 40028: Implement Tor Service controller Bug 40028: Integrate Tor Controller into HomeFragment Bug 40028: Implement Tor connect and logger screens Bug 40028: Implement Tor Onboarding Bug 40028: Implement new home screen Bug 40028: Define bootstrapping events and Quick Start Bug 40041: Implement Tor Network Settings Bug 40041: Integrate Tor Network Settings - - - - - c8bec06e by Alex Catarineu at 2021-04-20T21:04:09+00:00 Modify UI/UX Bug 40015: Modify Home menu Bug 40016: Hide unwanted Settings Bug 40016: Modify Default toolbar menu Bug 40016: Add Donate settings button Bug 40016: Move Allow Screenshots under Advanced Bug 40016: Dont install WebCompat webext Bug 40016: Dont onboard Search Suggestions Bug 40094: Do not use MasterPasswordTipProvider in HomeFragment Bug 40095: Hide Sign in to sync in bookmarks Bug 40031: Hide Mozilla-specific items on About page Bug 40032: Set usesCleartextTraffic as false Bug 40063: Do not sort search engines alphabetically Bug 34378: Port external helper app prompting With the corresponding android-components patch, this allows all `startActivity` that may open external apps to be replaced by `TorUtils.startActivityPrompt`. Bug 34403: Disable Normal mode by default Bug 40087: Implement a switch for english locale spoofing Bug 40144: Hide Download Manager Bug 40141: Hide EME site permission - - - - - ad26d7dd by Alex Catarineu at 2021-04-20T21:04:09+00:00 Modify Add-on support Bug 40030: Install HTTPS Everywhere and NoScript addons on startup HTTPS Everywhere is installed as a builtin extension and NoScript as a regular AMO addon. To avoid unnecessary I/O we only install NoScript the first time, and rely on the browser addon updating mechanism for keeping up with new versions. This is the same behaviour that was implemented in the Fennec-based Tor Browser, where it was installed as a distribution addon, which also only occurred once. Bug 40062: HTTPS Everywhere is not shown as installed Also 40070: Consider storing the list of recommended addons This implements our own AddonsProvider, which loads the list of available addons from assets instead of fetching it from an endpoint. In this list, we replace https-everywhere by our https-everywhere-eff, so that the EFF one is shown as installed in the addons list and the AMO one is not displayed. Also, we hide the uninstall button for builtin addons. Bug 40058: Hide option for disallowing addon in private mode - - - - - 774375bf by Matthew Finkel at 2021-04-20T21:04:20+00:00 Add Security Level UI Bug 40026: Implement Security Level settings
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 30605: Honor privacy.spoof_english in Android
commit a6d4226da0c0626ec7cd3b8ae28bd1f295c12acc
Author: Alex Catarineu
Date: Fri Oct 16 10:45:17 2020 +0200
Bug 30605: Honor privacy.spoof_english in Android
This checks `privacy.spoof_english` whenever `setLocales` is
called from Fenix side and sets `intl.accept_languages`
accordingly.
---
mobile/android/components/geckoview/GeckoViewStartup.jsm | 5 +
1 file changed, 5 insertions(+)
diff --git a/mobile/android/components/geckoview/GeckoViewStartup.jsm
b/mobile/android/components/geckoview/GeckoViewStartup.jsm
index 7aed100367c4..9ccc596a5f25 100644
--- a/mobile/android/components/geckoview/GeckoViewStartup.jsm
+++ b/mobile/android/components/geckoview/GeckoViewStartup.jsm
@@ -18,6 +18,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
Preferences: "resource://gre/modules/Preferences.jsm",
SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
Services: "resource://gre/modules/Services.jsm",
+ RFPHelper: "resource://gre/modules/RFPHelper.jsm",
});
const { debug, warn } = GeckoViewUtils.initLogging("Startup");
@@ -256,6 +257,10 @@ class GeckoViewStartup {
if (aData.requestedLocales) {
Services.locale.requestedLocales = aData.requestedLocales;
}
+RFPHelper._handleSpoofEnglishChanged();
+if (Services.prefs.getIntPref("privacy.spoof_english", 0) === 2) {
+ break;
+}
const pls = Cc["@mozilla.org/pref-localizedstring;1"].createInstance(
Ci.nsIPrefLocalizedString
);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware
commit 5d2cb964ab372b961e93d2f209122fa19afe8a6e
Author: Alex Catarineu
Date: Wed Nov 4 15:58:22 2020 +0100
Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware
---
.../main/java/org/mozilla/geckoview/WebRequest.java| 18 ++
widget/android/WebExecutorSupport.cpp | 10 ++
2 files changed, 28 insertions(+)
diff --git
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java
index d1d6e06b7396..4e17bc034edb 100644
---
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java
+++
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebRequest.java
@@ -51,6 +51,11 @@ public class WebRequest extends WebMessage {
*/
public final @Nullable String referrer;
+/**
+ * The value of the origin of this request.
+ */
+public final @Nullable String origin;
+
@Retention(RetentionPolicy.SOURCE)
@IntDef({CACHE_MODE_DEFAULT, CACHE_MODE_NO_STORE,
CACHE_MODE_RELOAD, CACHE_MODE_NO_CACHE,
@@ -112,6 +117,7 @@ public class WebRequest extends WebMessage {
method = builder.mMethod;
cacheMode = builder.mCacheMode;
referrer = builder.mReferrer;
+origin = builder.mOrigin;
if (builder.mBody != null) {
body = builder.mBody.asReadOnlyBuffer();
@@ -128,6 +134,7 @@ public class WebRequest extends WebMessage {
/* package */ String mMethod = "GET";
/* package */ int mCacheMode = CACHE_MODE_DEFAULT;
/* package */ String mReferrer;
+/* package */ String mOrigin;
/**
* Construct a Builder instance with the specified URI.
@@ -226,6 +233,17 @@ public class WebRequest extends WebMessage {
return this;
}
+/**
+ * Set the origin URI.
+ *
+ * @param origin A URI String
+ * @return This Builder instance.
+ */
+public @NonNull Builder origin(final @Nullable String origin) {
+mOrigin = origin;
+return this;
+}
+
/**
* @return A {@link WebRequest} constructed with the values from this
Builder instance.
*/
diff --git a/widget/android/WebExecutorSupport.cpp
b/widget/android/WebExecutorSupport.cpp
index f854404cafe2..ba5457572e8b 100644
--- a/widget/android/WebExecutorSupport.cpp
+++ b/widget/android/WebExecutorSupport.cpp
@@ -392,6 +392,16 @@ nsresult WebExecutorSupport::CreateStreamLoader(
MOZ_ASSERT(cookieJarSettings);
nsCOMPtr loadInfo = channel->LoadInfo();
+
+ RefPtr originUri;
+ const auto origin = req->Origin();
+ if (origin) {
+rv = NS_NewURI(getter_AddRefs(originUri), origin->ToString());
+NS_ENSURE_SUCCESS(rv, NS_ERROR_MALFORMED_URI);
+OriginAttributes attrs = loadInfo->GetOriginAttributes();
+attrs.SetFirstPartyDomain(true, originUri);
+loadInfo->SetOriginAttributes(attrs);
+ }
loadInfo->SetCookieJarSettings(cookieJarSettings);
// setup http/https specific things
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 40198: Expose privacy.spoof_english pref in GeckoView
commit 626b3f3c0d74492e57d71d68a27cc1ee224a4757
Author: Alex Catarineu
Date: Sun Oct 18 17:06:04 2020 +0200
Bug 40198: Expose privacy.spoof_english pref in GeckoView
---
mobile/android/geckoview/api.txt | 3 ++
.../mozilla/geckoview/GeckoRuntimeSettings.java| 33 ++
2 files changed, 36 insertions(+)
diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt
index b113d1025c26..37adf590007e 100644
--- a/mobile/android/geckoview/api.txt
+++ b/mobile/android/geckoview/api.txt
@@ -644,6 +644,7 @@ package org.mozilla.geckoview {
method public boolean getRemoteDebuggingEnabled();
method @Nullable public GeckoRuntime getRuntime();
method @Nullable public Rect getScreenSizeOverride();
+method public boolean getSpoofEnglish();
method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate();
method public int getTorSecurityLevel();
method public boolean getUseMaxScreenDepth();
@@ -664,6 +665,7 @@ package org.mozilla.geckoview {
method @NonNull public GeckoRuntimeSettings
setLoginAutofillEnabled(boolean);
method @NonNull public GeckoRuntimeSettings setPreferredColorScheme(int);
method @NonNull public GeckoRuntimeSettings
setRemoteDebuggingEnabled(boolean);
+method @NonNull public GeckoRuntimeSettings setSpoofEnglish(boolean);
method @NonNull public GeckoRuntimeSettings setTorSecurityLevel(int);
method @NonNull public GeckoRuntimeSettings setWebFontsEnabled(boolean);
method @NonNull public GeckoRuntimeSettings setWebManifestEnabled(boolean);
@@ -703,6 +705,7 @@ package org.mozilla.geckoview {
method @NonNull public GeckoRuntimeSettings.Builder
preferredColorScheme(int);
method @NonNull public GeckoRuntimeSettings.Builder
remoteDebuggingEnabled(boolean);
method @NonNull public GeckoRuntimeSettings.Builder
screenSizeOverride(int, int);
+method @NonNull public GeckoRuntimeSettings.Builder spoofEnglish(boolean);
method @NonNull public GeckoRuntimeSettings.Builder
telemetryDelegate(@NonNull RuntimeTelemetry.Delegate);
method @NonNull public GeckoRuntimeSettings.Builder torSecurityLevel(int);
method @NonNull public GeckoRuntimeSettings.Builder
useMaxScreenDepth(boolean);
diff --git
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
index 8e92bd839cbf..e59c220766c3 100644
---
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
+++
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
@@ -469,6 +469,17 @@ public final class GeckoRuntimeSettings extends
RuntimeSettings {
getSettings().mTorSecurityLevel.set(level);
return this;
}
+
+/**
+ * Sets whether we should spoof locale to English for webpages.
+ *
+ * @param flag True if we should spoof locale to English for webpages,
false otherwise.
+ * @return This Builder instance.
+ */
+public @NonNull Builder spoofEnglish(final boolean flag) {
+getSettings().mSpoofEnglish.set(flag ? 2 : 1);
+return this;
+}
}
private GeckoRuntime mRuntime;
@@ -523,6 +534,8 @@ public final class GeckoRuntimeSettings extends
RuntimeSettings {
"dom.security.https_only_mode_pbm", false);
/* package */ final Pref mTorSecurityLevel = new Pref<>(
"extensions.torbutton.security_slider", 4);
+/* package */ final Pref mSpoofEnglish = new Pref<>(
+"privacy.spoof_english", 0);
/* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM;
@@ -1247,6 +1260,26 @@ public final class GeckoRuntimeSettings extends
RuntimeSettings {
return this;
}
+/**
+ * Get whether we should spoof locale to English for webpages.
+ *
+ * @return Whether we should spoof locale to English for webpages.
+ */
+public boolean getSpoofEnglish() {
+return mSpoofEnglish.get() == 2;
+}
+
+/**
+ * Set whether we should spoof locale to English for webpages.
+ *
+ * @param flag A flag determining whether we should locale to English for
webpages.
+ * @return This GeckoRuntimeSettings instance.
+ */
+public @NonNull GeckoRuntimeSettings setSpoofEnglish(final boolean flag) {
+mSpoofEnglish.commit(flag ? 2 : 1);
+return this;
+}
+
@Override // Parcelable
public void writeToParcel(final Parcel out, final int flags) {
super.writeToParcel(out, flags);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 40309: Avoid using regional OS locales
commit 40c60ceacc9657f2948fe2f2dfde54838819bf48
Author: Alex Catarineu
Date: Wed Jan 27 11:28:05 2021 +0100
Bug 40309: Avoid using regional OS locales
Only use regional OS locales if the pref
`intl.regional_prefs.use_os_locales` is set to true.
---
intl/locale/LocaleService.cpp | 25 -
1 file changed, 25 deletions(-)
diff --git a/intl/locale/LocaleService.cpp b/intl/locale/LocaleService.cpp
index d8b629787770..027e58bf9974 100644
--- a/intl/locale/LocaleService.cpp
+++ b/intl/locale/LocaleService.cpp
@@ -459,31 +459,6 @@
LocaleService::GetRegionalPrefsLocales(nsTArray& aRetVal) {
OSPreferences::GetInstance()->GetRegionalPrefsLocales(aRetVal))) {
return NS_OK;
}
-
-// If we fail to retrieve them, return the app locales.
-GetAppLocalesAsBCP47(aRetVal);
-return NS_OK;
- }
-
- // Otherwise, fetch OS Regional Preferences locales and compare the first one
- // to the app locale. If the language subtag matches, we can safely use
- // the OS Regional Preferences locale.
- //
- // This facilitates scenarios such as Firefox in "en-US" and User sets
- // regional prefs to "en-GB".
- nsAutoCString appLocale;
- AutoTArray regionalPrefsLocales;
- LocaleService::GetInstance()->GetAppLocaleAsBCP47(appLocale);
-
- if (NS_FAILED(OSPreferences::GetInstance()->GetRegionalPrefsLocales(
- regionalPrefsLocales))) {
-GetAppLocalesAsBCP47(aRetVal);
-return NS_OK;
- }
-
- if (LocaleService::LanguagesMatch(appLocale, regionalPrefsLocales[0])) {
-aRetVal = regionalPrefsLocales.Clone();
-return NS_OK;
}
// Otherwise use the app locales.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView
commit 8068baa1a6ccd44fb75c9a5017924477066fec81
Author: Alex Catarineu
Date: Tue Oct 20 17:44:36 2020 +0200
Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView
---
.../mozilla/geckoview/GeckoRuntimeSettings.java| 28 +-
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
index b753be9c5209..8e92bd839cbf 100644
---
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
+++
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
@@ -778,19 +778,25 @@ public final class GeckoRuntimeSettings extends
RuntimeSettings {
private String computeAcceptLanguages() {
final ArrayList locales = new ArrayList();
-// Explicitly-set app prefs come first:
-if (mRequestedLocales != null) {
-for (final String locale : mRequestedLocales) {
-locales.add(locale.toLowerCase(Locale.ROOT));
-}
-}
-// OS prefs come second:
-for (final String locale : getDefaultLocales()) {
-final String localeLowerCase = locale.toLowerCase(Locale.ROOT);
-if (!locales.contains(localeLowerCase)) {
-locales.add(localeLowerCase);
+// In Desktop, these are defined in the `intl.accept_languages`
localized property.
+// At some point we should probably use the same values here, but for
now we use a simple
+// strategy which will hopefully result in reasonable acceptLanguage
values.
+if (mRequestedLocales != null && mRequestedLocales.length > 0) {
+String locale = mRequestedLocales[0].toLowerCase(Locale.ROOT);
+// No need to include `en-us` twice.
+if (!locale.equals("en-us")) {
+locales.add(locale);
+if (locale.contains("-")) {
+String lang = locale.split("-")[0];
+// No need to include `en` twice.
+if (!lang.equals("en")) {
+locales.add(lang);
+}
+}
}
}
+locales.add("en-us");
+locales.add("en");
return TextUtils.join(",", locales);
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 40125: Expose Security Level pref in GeckoView
commit 465c01476bbdb60b88d8ff56e4d6bf3bd44cb532
Author: Matthew Finkel
Date: Mon Sep 14 02:52:28 2020 +
Bug 40125: Expose Security Level pref in GeckoView
---
mobile/android/geckoview/api.txt | 3 ++
.../mozilla/geckoview/GeckoRuntimeSettings.java| 33 ++
2 files changed, 36 insertions(+)
diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt
index 21f2cf984eb2..b113d1025c26 100644
--- a/mobile/android/geckoview/api.txt
+++ b/mobile/android/geckoview/api.txt
@@ -645,6 +645,7 @@ package org.mozilla.geckoview {
method @Nullable public GeckoRuntime getRuntime();
method @Nullable public Rect getScreenSizeOverride();
method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate();
+method public int getTorSecurityLevel();
method public boolean getUseMaxScreenDepth();
method public boolean getWebFontsEnabled();
method public boolean getWebManifestEnabled();
@@ -663,6 +664,7 @@ package org.mozilla.geckoview {
method @NonNull public GeckoRuntimeSettings
setLoginAutofillEnabled(boolean);
method @NonNull public GeckoRuntimeSettings setPreferredColorScheme(int);
method @NonNull public GeckoRuntimeSettings
setRemoteDebuggingEnabled(boolean);
+method @NonNull public GeckoRuntimeSettings setTorSecurityLevel(int);
method @NonNull public GeckoRuntimeSettings setWebFontsEnabled(boolean);
method @NonNull public GeckoRuntimeSettings setWebManifestEnabled(boolean);
field public static final int ALLOW_ALL = 0;
@@ -702,6 +704,7 @@ package org.mozilla.geckoview {
method @NonNull public GeckoRuntimeSettings.Builder
remoteDebuggingEnabled(boolean);
method @NonNull public GeckoRuntimeSettings.Builder
screenSizeOverride(int, int);
method @NonNull public GeckoRuntimeSettings.Builder
telemetryDelegate(@NonNull RuntimeTelemetry.Delegate);
+method @NonNull public GeckoRuntimeSettings.Builder torSecurityLevel(int);
method @NonNull public GeckoRuntimeSettings.Builder
useMaxScreenDepth(boolean);
method @NonNull public GeckoRuntimeSettings.Builder
webFontsEnabled(boolean);
method @NonNull public GeckoRuntimeSettings.Builder webManifest(boolean);
diff --git
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
index 3ac72b2ee870..b753be9c5209 100644
---
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
+++
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
@@ -458,6 +458,17 @@ public final class GeckoRuntimeSettings extends
RuntimeSettings {
getSettings().setAllowInsecureConnections(level);
return this;
}
+
+/**
+ * Set security level.
+ *
+ * @param level A value determining the security level. Default is 0.
+ * @return This Builder instance.
+ */
+public @NonNull Builder torSecurityLevel(final int level) {
+getSettings().mTorSecurityLevel.set(level);
+return this;
+}
}
private GeckoRuntime mRuntime;
@@ -510,6 +521,8 @@ public final class GeckoRuntimeSettings extends
RuntimeSettings {
"dom.security.https_only_mode", false);
/* package */ final Pref mHttpsOnlyPrivateMode = new
Pref(
"dom.security.https_only_mode_pbm", false);
+/* package */ final Pref mTorSecurityLevel = new Pref<>(
+"extensions.torbutton.security_slider", 4);
/* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM;
@@ -1208,6 +1221,26 @@ public final class GeckoRuntimeSettings extends
RuntimeSettings {
return this;
}
+/**
+ * Gets the current security level.
+ *
+ * @return current security protection level
+ */
+public int getTorSecurityLevel() {
+return mTorSecurityLevel.get();
+}
+
+/**
+ * Sets the Tor Security Level.
+ *
+ * @param level security protection level
+ * @return This GeckoRuntimeSettings instance.
+ */
+public @NonNull GeckoRuntimeSettings setTorSecurityLevel(final int level) {
+mTorSecurityLevel.commit(level);
+return this;
+}
+
@Override // Parcelable
public void writeToParcel(final Parcel out, final int flags) {
super.writeToParcel(out, flags);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
commit 80a0c1306a49eb8c560ba779b90b87d4332cf168
Author: Alex Catarineu
Date: Fri Oct 9 12:55:35 2020 +0200
Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
---
browser/app/profile/000-tor-browser.js | 3 +++
browser/components/BrowserGlue.jsm | 14 ++
2 files changed, 17 insertions(+)
diff --git a/browser/app/profile/000-tor-browser.js
b/browser/app/profile/000-tor-browser.js
index 9649f05536c3..76ee3a4aa1e1 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -317,6 +317,9 @@ pref("security.enterprise_roots.enabled", false);
// Don't ping Mozilla for MitM detection, see bug 32321
pref("security.certerrors.mitm.priming.enabled", false);
+// Don't automatically enable enterprise roots, see bug 40166
+pref("security.certerrors.mitm.auto_enable_enterprise_roots", false);
+
// Disable the language pack signing check for now on macOS, see #31942
#ifdef XP_MACOSX
pref("extensions.langpacks.signatures.required", false);
diff --git a/browser/components/BrowserGlue.jsm
b/browser/components/BrowserGlue.jsm
index 5056af96c6a4..5a3b8dec6541 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -1362,6 +1362,20 @@ BrowserGlue.prototype = {
// handle any UI migration
this._migrateUI();
+// Clear possibly auto enabled enterprise_roots prefs (see bug 40166)
+if (
+ !Services.prefs.getBoolPref(
+"security.certerrors.mitm.auto_enable_enterprise_roots"
+ ) &&
+ Services.prefs.getBoolPref(
+"security.enterprise_roots.auto-enabled",
+false
+ )
+) {
+ Services.prefs.clearUserPref("security.enterprise_roots.enabled");
+ Services.prefs.clearUserPref("security.enterprise_roots.auto-enabled");
+}
+
if (!Services.prefs.prefHasUserValue(PREF_PDFJS_ISDEFAULT_CACHE_STATE)) {
PdfJs.checkIsDefault(this._isNewProfile);
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 40002: Remove about:ion
commit 758c13bf16d3001476af7dc7213bb859d18fa5fa
Author: Kathy Brade
Date: Fri Aug 14 09:06:33 2020 -0400
Bug 40002: Remove about:ion
Firefox Ion (previously Firefox Pioneer) is an opt-in program in which
people
volunteer to participate in studies that collect detailed, sensitive data
about
how they use their browser.
---
browser/components/about/AboutRedirector.cpp | 2 --
browser/components/about/components.conf | 1 -
2 files changed, 3 deletions(-)
diff --git a/browser/components/about/AboutRedirector.cpp
b/browser/components/about/AboutRedirector.cpp
index 179b46804a0b..0c70bef77862 100644
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -122,8 +122,6 @@ static const RedirEntry kRedirMap[] = {
nsIAboutModule::URI_MUST_LOAD_IN_CHILD |
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
-{"ion", "chrome://browser/content/ion.html",
- nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT},
#ifdef TOR_BROWSER_UPDATE
{"tbupdate", "chrome://browser/content/abouttbupdate/aboutTBUpdate.xhtml",
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
diff --git a/browser/components/about/components.conf
b/browser/components/about/components.conf
index 3729b7e4bf82..5baf92e863c1 100644
--- a/browser/components/about/components.conf
+++ b/browser/components/about/components.conf
@@ -14,7 +14,6 @@ pages = [
'loginsimportreport',
'newinstall',
'newtab',
-'ion',
'pocket-saved',
'pocket-signup',
'policies',
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 40073: Disable remote Public Suffix List fetching
commit 80b3543f13b2a7d02e550af35aa6388b15202574
Author: Alex Catarineu
Date: Thu Aug 13 11:05:03 2020 +0200
Bug 40073: Disable remote Public Suffix List fetching
In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented
fetching the Public Suffix List via RemoteSettings and replacing the default
one at runtime, which we do not want.
---
browser/components/BrowserGlue.jsm | 5 -
1 file changed, 5 deletions(-)
diff --git a/browser/components/BrowserGlue.jsm
b/browser/components/BrowserGlue.jsm
index 6752cce1566d..d6e3303b0e2b 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -67,7 +67,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
PluralForm: "resource://gre/modules/PluralForm.jsm",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
ProcessHangMonitor: "resource:///modules/ProcessHangMonitor.jsm",
- PublicSuffixList: "resource://gre/modules/netwerk-dns/PublicSuffixList.jsm",
RemoteSettings: "resource://services-settings/remote-settings.js",
RemoteSecuritySettings:
"resource://gre/modules/psm/RemoteSecuritySettings.jsm",
@@ -2658,10 +2657,6 @@ BrowserGlue.prototype = {
this._addBreachesSyncHandler();
},
- () => {
-PublicSuffixList.init();
- },
-
() => {
RemoteSecuritySettings.init();
},
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop
commit ee85a0c5556c9002fffbf315cfb5e4e0d1476016
Author: Alex Catarineu
Date: Fri Sep 4 12:34:35 2020 +0200
Bug 40091: Load HTTPS Everywhere as a builtin addon in desktop
This loads HTTPS Everywhere as a builtin addon from a hardcoded
resource:// URI in desktop. It also ensures that the non-builtin
HTTPS Everywhere addon is always uninstalled on browser startup.
The reason of making this desktop-only is that there are some issues
when installing a builtin extension from geckoview side, making
the extension not available on first startup. So, at least for
now we handle the Fenix case separately. See #40118 for a followup
for investigating these.
---
browser/components/BrowserGlue.jsm | 37 ++
toolkit/components/extensions/Extension.jsm| 10 --
.../mozapps/extensions/internal/XPIProvider.jsm| 13
3 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/browser/components/BrowserGlue.jsm
b/browser/components/BrowserGlue.jsm
index d6e3303b0e2b..5056af96c6a4 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -42,6 +42,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
DownloadsViewableInternally:
"resource:///modules/DownloadsViewableInternally.jsm",
E10SUtils: "resource://gre/modules/E10SUtils.jsm",
+ ExtensionData: "resource://gre/modules/Extension.jsm",
ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
FeatureGate: "resource://featuregates/FeatureGate.jsm",
@@ -118,6 +119,13 @@ XPCOMUtils.defineLazyServiceGetter(
"nsIPushService"
);
+XPCOMUtils.defineLazyServiceGetters(this, {
+ resProto: [
+"@mozilla.org/network/protocol;1?name=resource",
+"nsISubstitutingProtocolHandler",
+ ],
+});
+
const PREF_PDFJS_ISDEFAULT_CACHE_STATE = "pdfjs.enabledCache.state";
/**
@@ -1414,6 +1422,35 @@ BrowserGlue.prototype = {
"resource://builtin-themes/alpenglow/"
);
+// Install https-everywhere builtin addon if needed.
+(async () => {
+ const HTTPS_EVERYWHERE_ID = "https-everywhere-...@eff.org";
+ const HTTPS_EVERYWHERE_BUILTIN_URL =
+"resource://torbutton/content/extensions/https-everywhere/";
+ // This does something similar as GeckoViewWebExtension.jsm: it tries
+ // to load the manifest to retrieve the version of the builtin and
+ // compares it to the currently installed one to see whether we need
+ // to install or not. Here we delegate that to
+ // AddonManager.maybeInstallBuiltinAddon.
+ try {
+const resolvedURI = Services.io.newURI(
+ resProto.resolveURI(Services.io.newURI(HTTPS_EVERYWHERE_BUILTIN_URL))
+);
+const extensionData = new ExtensionData(resolvedURI);
+const manifest = await extensionData.loadManifest();
+
+await AddonManager.maybeInstallBuiltinAddon(
+ HTTPS_EVERYWHERE_ID,
+ manifest.version,
+ HTTPS_EVERYWHERE_BUILTIN_URL
+);
+ } catch (e) {
+const log = Log.repository.getLogger("HttpsEverywhereBuiltinLoader");
+log.addAppender(new Log.ConsoleAppender(new Log.BasicFormatter()));
+log.error("Could not install https-everywhere extension", e);
+ }
+})();
+
if (AppConstants.MOZ_NORMANDY) {
Normandy.init();
}
diff --git a/toolkit/components/extensions/Extension.jsm
b/toolkit/components/extensions/Extension.jsm
index ae2bf4ce646f..fb390131c172 100644
--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/extensions/Extension.jsm
@@ -212,6 +212,7 @@ const LOGGER_ID_BASE = "addons.webextension.";
const UUID_MAP_PREF = "extensions.webextensions.uuids";
const LEAVE_STORAGE_PREF = "extensions.webextensions.keepStorageOnUninstall";
const LEAVE_UUID_PREF = "extensions.webextensions.keepUuidOnUninstall";
+const PERSISTENT_EXTENSIONS = new Set(["https-everywhere-...@eff.org"]);
const COMMENT_REGEXP = new RegExp(
String.raw`
@@ -358,7 +359,8 @@ var ExtensionAddonObserver = {
);
}
-if (!Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false)) {
+if (!Services.prefs.getBoolPref(LEAVE_STORAGE_PREF, false) &&
+ !PERSISTENT_EXTENSIONS.has(addon.id)) {
// Clear browser.storage.local backends.
AsyncShutdown.profileChangeTeardown.addBlocker(
`Clear Extension Storage ${addon.id} (File Backend)`,
@@ -406,7 +408,8 @@ var ExtensionAddonObserver = {
ExtensionPermissions.removeAll(addon.id);
-if (!Services.prefs.getBoolPref(LEAVE_UUID_PREF, false)) {
+if (!Services.prefs.getBoolPref(LEAVE_UUID_PREF, false) &&
+ !PERSISTENT_EXTENSIONS.has(addon.id)) {
// Clear the entry in the UUID map
UUIDMap.remove(addon.id);
}
@@ -2594,7 +2597,8 @@ class Extension extends ExtensionData {
);
} else if (
this.startupReason === "ADDON_INSTALL" &&
-
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 40025: Remove Mozilla add-on install permissions
commit 86f627e6a13bb2a887d59faa16ef44ff4d828889 Author: Alex Catarineu Date: Mon Jul 27 18:12:55 2020 +0200 Bug 40025: Remove Mozilla add-on install permissions --- browser/app/permissions | 5 - 1 file changed, 5 deletions(-) diff --git a/browser/app/permissions b/browser/app/permissions index 4938bd1e22e5..5c4c302f5ba5 100644 --- a/browser/app/permissions +++ b/browser/app/permissions @@ -11,11 +11,6 @@ origin uitour 1 https://3g2upl4pq6kufc4m.onion origin uitour 1 about:tor -# XPInstall -origin install 1 https://addons.mozilla.org - # Remote troubleshooting origin remote-troubleshooting 1 https://support.mozilla.org -# addon install -origin install 1 https://fpn.firefox.com ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
commit 53f09b4479f7d4b5a988488476fc031e67b4cdc3
Author: Kathy Brade
Date: Tue Jul 14 11:15:07 2020 -0400
Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
Hide elements on about:logins that mention sync, "Firefox LockWise", and
Mozilla's LockWise mobile apps.
Disable the "Create New Login" button when security.nocertdb is true.
---
browser/components/aboutlogins/AboutLoginsParent.jsm | 2 ++
browser/components/aboutlogins/content/aboutLogins.css | 8 +++-
browser/components/aboutlogins/content/aboutLogins.js | 6 ++
.../aboutlogins/content/components/fxaccounts-button.css | 5 +
.../components/aboutlogins/content/components/menu-button.css | 10 ++
5 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm
b/browser/components/aboutlogins/AboutLoginsParent.jsm
index 008d90daad28..7a46da7df882 100644
--- a/browser/components/aboutlogins/AboutLoginsParent.jsm
+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
@@ -65,6 +65,7 @@ const PASSWORD_SYNC_NOTIFICATION_ID = "enable-password-sync";
const SHOW_PASSWORD_SYNC_NOTIFICATION_PREF =
"signon.management.page.showPasswordSyncNotification";
+const NOCERTDB_PREF = "security.nocertdb";
// about:logins will always use the privileged content process,
// even if it is disabled for other consumers such as about:newtab.
@@ -280,6 +281,7 @@ class AboutLoginsParent extends JSWindowActorParent {
importVisible:
Services.policies.isAllowed("profileImport") &&
AppConstants.platform != "linux",
+canCreateLogins: !Services.prefs.getBoolPref(NOCERTDB_PREF, false),
});
await AboutLogins._sendAllLoginRelatedObjects(
diff --git a/browser/components/aboutlogins/content/aboutLogins.css
b/browser/components/aboutlogins/content/aboutLogins.css
index 79d46c336cc9..d3dd02f80b89 100644
--- a/browser/components/aboutlogins/content/aboutLogins.css
+++ b/browser/components/aboutlogins/content/aboutLogins.css
@@ -69,6 +69,11 @@ login-item {
grid-area: login;
}
+/* Do not promote Mozilla Sync in Tor Browser. */
+login-intro {
+ display: none !important;
+}
+
#branding-logo {
flex-basis: var(--sidebar-width);
flex-shrink: 0;
@@ -83,7 +88,8 @@ login-item {
}
}
-:root:not(.official-branding) #branding-logo {
+/* Hide "Firefox LockWise" branding in Tor Browser. */
+#branding-logo {
visibility: hidden;
}
diff --git a/browser/components/aboutlogins/content/aboutLogins.js
b/browser/components/aboutlogins/content/aboutLogins.js
index a7449f8343b3..f288fb6988fb 100644
--- a/browser/components/aboutlogins/content/aboutLogins.js
+++ b/browser/components/aboutlogins/content/aboutLogins.js
@@ -22,6 +22,9 @@ const gElements = {
".menuitem-remove-all-logins"
);
},
+ get createNewLoginButton() {
+return this.loginList.shadowRoot.querySelector(".create-login-button");
+ },
};
let numberOfLogins = 0;
@@ -111,6 +114,9 @@ window.addEventListener("AboutLoginsChromeToContent", event
=> {
gElements.loginList.setSortDirection(event.detail.value.selectedSort);
document.documentElement.classList.add("initialized");
gElements.loginList.classList.add("initialized");
+ if (!event.detail.value.canCreateLogins) {
+gElements.createNewLoginButton.disabled = true;
+ }
break;
}
case "ShowLoginItemError": {
diff --git
a/browser/components/aboutlogins/content/components/fxaccounts-button.css
b/browser/components/aboutlogins/content/components/fxaccounts-button.css
index e63192a98e3a..c59eda2dec56 100644
--- a/browser/components/aboutlogins/content/components/fxaccounts-button.css
+++ b/browser/components/aboutlogins/content/components/fxaccounts-button.css
@@ -8,6 +8,11 @@
align-items: center;
}
+/* Do not promote Mozilla Sync in Tor Browser. */
+.logged-out-view {
+ display: none !important;
+}
+
.fxaccounts-extra-text {
/* Only show at most 3 lines of text to limit the
text from overflowing the header. */
diff --git a/browser/components/aboutlogins/content/components/menu-button.css
b/browser/components/aboutlogins/content/components/menu-button.css
index d5d08b9df58e..788d9899de77 100644
--- a/browser/components/aboutlogins/content/components/menu-button.css
+++ b/browser/components/aboutlogins/content/components/menu-button.css
@@ -90,3 +90,13 @@
.menuitem-preferences {
background-image: url("chrome://global/skin/icons/settings.svg");
}
+
+/*
+ * Do not promote LockWise mobile apps in Tor Browser: hide the menu items
+ * and the separator line that precedes them.
+ */
+.menuitem-mobile-android,
+.menuitem-mobile-ios,
+button[data-event-name="AboutLoginsGetHelp"] + hr {
+ display: none !important;
+}
___
tor-commits mailing list
tor-commits@lists.torproject.org
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 21952: Implement Onion-Location
commit bb0bf1e1fbc279ab88f5417287c2a107664debb9
Author: Alex Catarineu
Date: Thu Mar 5 22:16:39 2020 +0100
Bug 21952: Implement Onion-Location
Whenever a valid Onion-Location HTTP header (or corresponding HTML
http-equiv attribute) is found in a document load, we either
redirect to it (if the user opted-in via preference) or notify the
presence of an onionsite alternative with a badge in the urlbar.
---
browser/base/content/browser.js| 12 ++
browser/base/content/browser.xhtml | 3 +
browser/components/BrowserGlue.jsm | 13 ++
.../onionservices/OnionLocationChild.jsm | 39 +
.../onionservices/OnionLocationParent.jsm | 168 +
.../content/onionlocation-notification-icons.css | 5 +
.../onionservices/content/onionlocation-urlbar.css | 27
.../content/onionlocation-urlbar.inc.xhtml | 10 ++
.../onionservices/content/onionlocation.svg| 3 +
.../content/onionlocationPreferences.inc.xhtml | 11 ++
.../content/onionlocationPreferences.js| 31
browser/components/onionservices/jar.mn| 2 +
browser/components/onionservices/moz.build | 2 +
browser/components/preferences/privacy.inc.xhtml | 2 +
browser/components/preferences/privacy.js | 17 +++
browser/themes/shared/notification-icons.inc.css | 2 +
browser/themes/shared/urlbar-searchbar.inc.css | 2 +
dom/base/Document.cpp | 34 -
dom/base/Document.h| 2 +
dom/webidl/Document.webidl | 8 +
modules/libpref/init/StaticPrefList.yaml | 5 +
xpcom/ds/StaticAtoms.py| 1 +
22 files changed, 398 insertions(+), 1 deletion(-)
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 17f5403be28f..5e45fa7e025a 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -49,6 +49,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
NetUtil: "resource://gre/modules/NetUtil.jsm",
NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
OpenInTabsUtils: "resource:///modules/OpenInTabsUtils.jsm",
+ OnionLocationParent: "resource:///modules/OnionLocationParent.jsm",
PageActions: "resource:///modules/PageActions.jsm",
PageThumbs: "resource://gre/modules/PageThumbs.jsm",
PanelMultiView: "resource:///modules/PanelMultiView.jsm",
@@ -5355,6 +5356,7 @@ var XULBrowserWindow = {
CFRPageActions.updatePageActions(gBrowser.selectedBrowser);
AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
+OnionLocationParent.updateOnionLocationBadge(gBrowser.selectedBrowser);
if (!gMultiProcessBrowser) {
// Bug 1108553 - Cannot rotate images with e10s
@@ -5845,6 +5847,16 @@ var CombinedStopReload = {
var TabsProgressListener = {
onStateChange(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) {
+// Clear OnionLocation UI
+if (
+ aStateFlags & Ci.nsIWebProgressListener.STATE_START &&
+ aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK &&
+ aRequest &&
+ aWebProgress.isTopLevel
+) {
+ OnionLocationParent.onStateChange(aBrowser);
+}
+
// Collect telemetry data about tab load times.
if (
aWebProgress.isTopLevel &&
diff --git a/browser/base/content/browser.xhtml
b/browser/base/content/browser.xhtml
index 1cb6b1015ce4..1662546f2115 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -2045,6 +2045,9 @@
onclick="FullZoom.reset(); FullZoom.resetScalingZoom();"
tooltip="dynamic-shortcut-tooltip"
hidden="true"/>
+
+#include ../../components/onionservices/content/onionlocation-urlbar.inc.xhtml
+
{},
+};
+
+const options = {
+ autofocus: true,
+ persistent: true,
+ removeOnDismissal: false,
+ eventCallback(aTopic) {
+if (aTopic === "removed") {
+ delete browser._onionLocationPrompt;
+ delete browser.onionpopupnotificationanchor;
+}
+ },
+ learnMoreURL: NOTIFICATION_LEARN_MORE_URL,
+ displayURI: {
+hostPort: NOTIFICATION_TITLE, // This is hacky, but allows us to have
a title without extra markup/css.
+ },
+ hideClose: true,
+ popupIconClass: "onionlocation-notification-icon",
+};
+
+// A hacky way of setting the popup anchor outside the usual url bar icon
box
+// onionlocationpopupnotificationanchor comes from
`${ANCHOR_ID}popupnotificationanchor`
+// From
https://searchfox.org/mozilla-esr68/rev/080f9ed47742644d2ff84f7aa0b10aea5c44301a/browser/components/newtab/lib/CFRPageActions.jsm#488
+browser.onionlocationpopupnotificationanchor = win.document.getElementById(
+ ONIONLOCATION_BUTTON_ID
+);
+
+
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 28005: Implement .onion alias urlbar rewrites
commit 9a069abb4084cb5bfc113c1edd61ee7c3b1da8b8
Author: Alex Catarineu
Date: Thu Feb 13 13:24:33 2020 +0100
Bug 28005: Implement .onion alias urlbar rewrites
A custom HTTPS Everywhere update channel is installed,
which provides rules for locally redirecting some memorable
.tor.onion URLs to non-memorable .onion URLs.
When these redirects occur, we also rewrite the URL in the urlbar
to display the human-memorable hostname instead of the actual
.onion.
Bug 34196: Update site info URL with the onion name
---
browser/actors/ClickHandlerChild.jsm | 20 ++
browser/actors/ClickHandlerParent.jsm | 1 +
browser/actors/ContextMenuChild.jsm| 4 +
browser/base/content/browser-places.js | 12 +-
browser/base/content/browser-siteIdentity.js | 12 +-
browser/base/content/browser.js| 43 -
browser/base/content/nsContextMenu.js | 18 ++
browser/base/content/pageinfo/pageInfo.js | 2 +-
browser/base/content/pageinfo/pageInfo.xhtml | 10 +
browser/base/content/pageinfo/security.js | 17 +-
browser/base/content/tabbrowser.js | 7 +
browser/base/content/utilityOverlay.js | 12 ++
browser/components/BrowserGlue.jsm | 8 +
.../onionservices/ExtensionMessaging.jsm | 77
.../onionservices/HttpsEverywhereControl.jsm | 119
.../components/onionservices/OnionAliasStore.jsm | 201 +
browser/components/onionservices/moz.build | 6 +
browser/components/urlbar/UrlbarInput.jsm | 13 +-
docshell/base/nsDocShell.cpp | 52 ++
docshell/base/nsDocShell.h | 6 +
docshell/base/nsDocShellLoadState.cpp | 8 +
docshell/base/nsIDocShell.idl | 5 +
docshell/base/nsIWebNavigation.idl | 5 +
docshell/shistory/SessionHistoryEntry.cpp | 14 ++
docshell/shistory/SessionHistoryEntry.h| 1 +
docshell/shistory/nsISHEntry.idl | 5 +
docshell/shistory/nsSHEntry.cpp| 22 ++-
docshell/shistory/nsSHEntry.h | 1 +
dom/interfaces/base/nsIBrowser.idl | 3 +-
dom/ipc/BrowserChild.cpp | 2 +
dom/ipc/BrowserParent.cpp | 3 +-
dom/ipc/PBrowser.ipdl | 1 +
modules/libpref/init/StaticPrefList.yaml | 6 +
netwerk/dns/effective_tld_names.dat| 2 +
netwerk/ipc/DocumentLoadListener.cpp | 10 +
toolkit/content/widgets/browser-custom-element.js | 13 +-
toolkit/modules/sessionstore/SessionHistory.jsm| 5 +
xpcom/reflect/xptinfo/xptinfo.h| 3 +-
38 files changed, 726 insertions(+), 23 deletions(-)
diff --git a/browser/actors/ClickHandlerChild.jsm
b/browser/actors/ClickHandlerChild.jsm
index 49aa06a7f43c..7448e5ad364f 100644
--- a/browser/actors/ClickHandlerChild.jsm
+++ b/browser/actors/ClickHandlerChild.jsm
@@ -134,6 +134,26 @@ class ClickHandlerChild extends JSWindowActorChild {
json.originStoragePrincipal = ownerDoc.effectiveStoragePrincipal;
json.triggeringPrincipal = ownerDoc.nodePrincipal;
+ // Check if the link needs to be opened with .tor.onion urlbar rewrites
+ // allowed. Only when the owner doc has onionUrlbarRewritesAllowed = true
+ // and the same origin we should allow this.
+ json.onionUrlbarRewritesAllowed = false;
+ if (this.docShell.onionUrlbarRewritesAllowed) {
+const sm = Services.scriptSecurityManager;
+try {
+ let targetURI = Services.io.newURI(href);
+ let isPrivateWin =
+ownerDoc.nodePrincipal.originAttributes.privateBrowsingId > 0;
+ sm.checkSameOriginURI(
+docshell.currentDocumentChannel.URI,
+targetURI,
+false,
+isPrivateWin
+ );
+ json.onionUrlbarRewritesAllowed = true;
+} catch (e) {}
+ }
+
// If a link element is clicked with middle button, user wants to open
// the link somewhere rather than pasting clipboard content. Therefore,
// when it's clicked with middle button, we should prevent multiple
diff --git a/browser/actors/ClickHandlerParent.jsm
b/browser/actors/ClickHandlerParent.jsm
index 75509b95ce7f..06d56624e316 100644
--- a/browser/actors/ClickHandlerParent.jsm
+++ b/browser/actors/ClickHandlerParent.jsm
@@ -99,6 +99,7 @@ class ClickHandlerParent extends JSWindowActorParent {
charset: browser.characterSet,
referrerInfo: E10SUtils.deserializeReferrerInfo(data.referrerInfo),
allowMixedContent: data.allowMixedContent,
+ onionUrlbarRewritesAllowed: data.onionUrlbarRewritesAllowed,
isContentWindowPrivate: data.isContentWindowPrivate,
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 28125 - Prevent non-Necko network connections
commit 017d2e96e156f612f595885c7aff6506cf14963e
Author: Matthew Finkel
Date: Thu Oct 25 19:17:09 2018 +
Bug 28125 - Prevent non-Necko network connections
---
.../gecko/media/GeckoMediaDrmBridgeV21.java| 49 +-
.../exoplayer2/upstream/DefaultHttpDataSource.java | 47 ++---
2 files changed, 4 insertions(+), 92 deletions(-)
diff --git
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java
index 30b373d5935d..6282e99fb5ee 100644
---
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java
+++
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/GeckoMediaDrmBridgeV21.java
@@ -488,54 +488,7 @@ public class GeckoMediaDrmBridgeV21 implements
GeckoMediaDrm {
@Override
protected Void doInBackground(final Void... params) {
-HttpURLConnection urlConnection = null;
-BufferedReader in = null;
-try {
-final URI finalURI = new URI(mURL + "=" +
URLEncoder.encode(new String(mDrmRequest), "UTF-8"));
-urlConnection = (HttpURLConnection)
ProxySelector.openConnectionWithProxy(finalURI);
-urlConnection.setRequestMethod("POST");
-if (DEBUG) Log.d(LOGTAG, "Provisioning, posting url =" +
finalURI.toString());
-
-// Add data
-urlConnection.setRequestProperty("Accept", "*/*");
-urlConnection.setRequestProperty("User-Agent",
getCDMUserAgent());
-urlConnection.setRequestProperty("Content-Type",
"application/json");
-
-// Execute HTTP Post Request
-urlConnection.connect();
-
-final int responseCode = urlConnection.getResponseCode();
-if (responseCode == HttpURLConnection.HTTP_OK) {
-in = new BufferedReader(new
InputStreamReader(urlConnection.getInputStream(), StringUtils.UTF_8));
-String inputLine;
-final StringBuffer response = new StringBuffer();
-
-while ((inputLine = in.readLine()) != null) {
-response.append(inputLine);
-}
-in.close();
-mResponseBody =
String.valueOf(response).getBytes(StringUtils.UTF_8);
-if (DEBUG) Log.d(LOGTAG, "Provisioning, response
received.");
-if (mResponseBody != null) Log.d(LOGTAG, "response
length=" + mResponseBody.length);
-} else {
-Log.d(LOGTAG, "Provisioning, server returned HTTP error
code :" + responseCode);
-}
-} catch (final IOException e) {
-Log.e(LOGTAG, "Got exception during posting provisioning
request ...", e);
-} catch (final URISyntaxException e) {
-Log.e(LOGTAG, "Got exception during creating uri ...", e);
-} finally {
-if (urlConnection != null) {
-urlConnection.disconnect();
-}
-try {
-if (in != null) {
-in.close();
-}
-} catch (final IOException e) {
-Log.e(LOGTAG, "Exception during closing in ...", e);
-}
-}
+Log.i(LOGTAG, "This is Tor Browser. Skipping.");
return null;
}
diff --git
a/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
b/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
index 6e5095b0a4c9..a585e283ed4e 100644
---
a/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
+++
b/mobile/android/geckoview/src/thirdparty/java/org/mozilla/thirdparty/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
@@ -46,6 +46,7 @@ import java.util.regex.Pattern;
import java.util.zip.GZIPInputStream;
import org.mozilla.gecko.util.ProxySelector;
+
/**
* An {@link HttpDataSource} that uses Android's {@link HttpURLConnection}.
*
@@ -516,50 +517,8 @@ public class DefaultHttpDataSource extends BaseDataSource
implements HttpDataSou
boolean followRedirects,
Map requestParameters)
throws IOException, URISyntaxException {
-/**
- * Tor Project modified the way the connection object was created. For the
sake of
- * simplicity, instead of duplicating the whole file we changed the
connection object
- * to use the ProxySelector.
- */
-HttpURLConnection connection = (HttpURLConnection)
ProxySelector.openConnectionWithProxy(url.toURI());
-
-
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 24796 - Comment out excess permissions from GeckoView
commit ca4068e14b9103b11b250e42c65b6e3e69949020 Author: Matthew Finkel Date: Wed Apr 11 17:52:59 2018 + Bug 24796 - Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. --- .../android/geckoview/src/main/AndroidManifest.xml | 20 +--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/mobile/android/geckoview/src/main/AndroidManifest.xml b/mobile/android/geckoview/src/main/AndroidManifest.xml index a76b6a4754b6..7a2f30708fc3 100644 --- a/mobile/android/geckoview/src/main/AndroidManifest.xml +++ b/mobile/android/geckoview/src/main/AndroidManifest.xml @@ -6,20 +6,32 @@ http://schemas.android.com/apk/res/android; package="org.mozilla.geckoview"> + + + + + + + + + + https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
commit 15eeb12159695a18caba7109485b4a0e3d55363f
Author: Richard Pospesel
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 | 55 --
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(+), 69 deletions(-)
diff --git a/browser/components/moz.build b/browser/components/moz.build
index ef09055b990a..e99fa19d896a 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -55,6 +55,7 @@ DIRS += [
"syncedtabs",
"uitour",
"urlbar",
+"torpreferences",
"translation",
]
diff --git a/browser/components/preferences/main.inc.xhtml
b/browser/components/preferences/main.inc.xhtml
index 2d55e165c5ba..78d0cea8b8a2 100644
--- a/browser/components/preferences/main.inc.xhtml
+++ b/browser/components/preferences/main.inc.xhtml
@@ -665,59 +665,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/browser/components/preferences/main.js
b/browser/components/preferences/main.js
index b5a192fc274a..6daf5b329878 100644
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
@@ -364,15 +364,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();
@@ -506,11 +497,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;
+
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 31607: App menu items stop working on macOS
commit 39b8b232ae5c06a6a1edf5fb40db23409ec3ac16
Author: Kathy Brade
Date: Thu Oct 3 10:53:43 2019 -0400
Bug 31607: App menu items stop working on macOS
Avoid re-creating the hidden window, since this causes the nsMenuBarX
object that is associated with the app menu to be freed (which in
turn causes all of the app menu items to stop working).
More detail: There should only be one hidden window.
XREMain::XRE_mainRun() contains an explicit call to create the
hidden window and that is the normal path by which it is created.
However, when Tor Launcher's wizard/progress window is opened during
startup, a hidden window is created earlier as a side effect of
calls to nsAppShellService::GetHiddenWindow(). Then, when
XREMain::XRE_mainRun() creates its hidden window, the original one
is freed which also causes the app menu's nsMenuBarX object which
is associated with that window to be destroyed. When that happens,
the menuGroupOwner property within each Cocoa menu items's MenuItemInfo
object is cleared. This breaks the link that is necessary for
NativeMenuItemTarget's menuItemHit method to dispatch a menu item
event.
---
xpfe/appshell/nsAppShellService.cpp | 4
1 file changed, 4 insertions(+)
diff --git a/xpfe/appshell/nsAppShellService.cpp
b/xpfe/appshell/nsAppShellService.cpp
index c7c3da49d86e..1cb1c6f5a7f9 100644
--- a/xpfe/appshell/nsAppShellService.cpp
+++ b/xpfe/appshell/nsAppShellService.cpp
@@ -93,6 +93,10 @@ void nsAppShellService::EnsureHiddenWindow() {
NS_IMETHODIMP
nsAppShellService::CreateHiddenWindow() {
+ if (mHiddenWindow) {
+return NS_OK;
+ }
+
if (!XRE_IsParentProcess()) {
return NS_ERROR_NOT_IMPLEMENTED;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 31740: Remove some unnecessary RemoteSettings instances
commit 3617a722e56d0f362a91354988be070afa7ed54d
Author: Alex Catarineu
Date: Wed Oct 16 23:01:12 2019 +0200
Bug 31740: Remove some unnecessary RemoteSettings instances
More concretely, SearchService.jsm 'hijack-blocklists' and
url-classifier-skip-urls.
Avoid creating instance for 'anti-tracking-url-decoration'.
If prefs are disabling their usage, avoid creating instances for
'cert-revocations' and 'intermediates'.
Do not ship JSON dumps for collections we do not expect to need. For
the ones in the 'main' bucket, this prevents them from being synced
unnecessarily (the code in remote-settings does so for collections
in the main bucket for which a dump or local data exists). For the
collections in the other buckets, we just save some size by not
shipping their dumps.
We also clear the collections database on the v2 -> v3 migration.
---
browser/app/profile/000-tor-browser.js | 3 +++
browser/components/search/SearchSERPTelemetry.jsm | 6 --
.../url-classifier/UrlClassifierFeatureBase.cpp| 2 +-
netwerk/url-classifier/components.conf | 6 --
security/manager/ssl/RemoteSecuritySettings.jsm| 23 ++
services/settings/IDBHelpers.jsm | 4
services/settings/dumps/blocklists/moz.build | 1 -
services/settings/dumps/main/moz.build | 7 ---
services/settings/dumps/security-state/moz.build | 1 -
.../components/antitracking/antitracking.manifest | 2 +-
toolkit/components/antitracking/components.conf| 7 ---
toolkit/components/search/SearchService.jsm| 2 --
12 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/browser/app/profile/000-tor-browser.js
b/browser/app/profile/000-tor-browser.js
index 55c00e35ea76..9649f05536c3 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -149,6 +149,9 @@ pref("extensions.fxmonitor.enabled", false);
pref("signon.management.page.mobileAndroidURL", "");
pref("signon.management.page.mobileAppleURL", "");
+// Disable remote "password recipes"
+pref("signon.recipes.remoteRecipesEnabled", false);
+
// Disable ServiceWorkers and push notifications by default
pref("dom.serviceWorkers.enabled", false);
pref("dom.push.enabled", false);
diff --git a/browser/components/search/SearchSERPTelemetry.jsm
b/browser/components/search/SearchSERPTelemetry.jsm
index a11bfc7176c9..efb5f2318fe4 100644
--- a/browser/components/search/SearchSERPTelemetry.jsm
+++ b/browser/components/search/SearchSERPTelemetry.jsm
@@ -95,13 +95,7 @@ class TelemetryHandler {
return;
}
-this._telemetrySettings = RemoteSettings(TELEMETRY_SETTINGS_KEY);
let rawProviderInfo = [];
-try {
- rawProviderInfo = await this._telemetrySettings.get();
-} catch (ex) {
- logConsole.error("Could not get settings:", ex);
-}
// Send the provider info to the child handler.
this._contentHandler.init(rawProviderInfo);
diff --git a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
index 07da1fd07374..48bcc7d10af9 100644
--- a/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
+++ b/netwerk/url-classifier/UrlClassifierFeatureBase.cpp
@@ -78,7 +78,7 @@ void UrlClassifierFeatureBase::InitializePreferences() {
nsCOMPtr exceptionListService =
do_GetService("@mozilla.org/url-classifier/exception-list-service;1");
- if (NS_WARN_IF(!exceptionListService)) {
+ if (!exceptionListService) {
return;
}
diff --git a/netwerk/url-classifier/components.conf
b/netwerk/url-classifier/components.conf
index 03a02f0ebeab..b2e667247317 100644
--- a/netwerk/url-classifier/components.conf
+++ b/netwerk/url-classifier/components.conf
@@ -13,10 +13,4 @@ Classes = [
'constructor': 'mozilla::net::ChannelClassifierService::GetSingleton',
'headers': ['mozilla/net/ChannelClassifierService.h'],
},
-{
-'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}',
-'contract_ids':
['@mozilla.org/url-classifier/exception-list-service;1'],
-'jsm': 'resource://gre/modules/UrlClassifierExceptionListService.jsm',
-'constructor': 'UrlClassifierExceptionListService',
-},
]
diff --git a/security/manager/ssl/RemoteSecuritySettings.jsm
b/security/manager/ssl/RemoteSecuritySettings.jsm
index 0beca1424741..1cffbd907bae 100644
--- a/security/manager/ssl/RemoteSecuritySettings.jsm
+++ b/security/manager/ssl/RemoteSecuritySettings.jsm
@@ -336,6 +336,16 @@ var RemoteSecuritySettings = {
class IntermediatePreloads {
constructor() {
+this.maybeInit();
+ }
+
+ maybeInit() {
+if (
+ this.client ||
+ !Services.prefs.getBoolPref(INTERMEDIATES_ENABLED_PREF, true)
+) {
+ return;
+}
this.client = RemoteSettings(
Services.prefs.getCharPref(INTERMEDIATES_COLLECTION_PREF),
{
@@ -365,6
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 32418: Allow updates to be disabled via an enterprise policy.
commit 6eceaa0e89d3fb416e8cd6215abb77b2f94512f1
Author: Kathy Brade
Date: Thu Apr 16 17:07:09 2020 -0400
Bug 32418: Allow updates to be disabled via an enterprise policy.
Restrict the Enterprise Policies mechanism to only consult a
policies.json file (avoiding the Windows Registry and macOS's
file system attributes).
Add a few disabledByPolicy() checks to the update service to
avoid extraneous (and potentially confusing) log messages when
updates are disabled by policy.
Sample content for distribution/policies.json:
{
"policies": {
"DisableAppUpdate": true
}
}
On Linux, avoid reading policies from /etc/firefox/policies/policies.json
---
.../enterprisepolicies/EnterprisePoliciesParent.jsm| 14 --
toolkit/components/enterprisepolicies/moz.build| 3 +++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm
b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm
index 775144e8a649..9fe916236cbc 100644
--- a/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm
+++ b/toolkit/components/enterprisepolicies/EnterprisePoliciesParent.jsm
@@ -4,6 +4,10 @@
var EXPORTED_SYMBOLS = ["EnterprisePoliciesManager"];
+// To ensure that policies intended for Firefox or another browser will not
+// be used, Tor Browser only looks for policies in ${InstallDir}/distribution
+#define AVOID_SYSTEM_POLICIES MOZ_PROXY_BYPASS_PROTECTION
+
const { XPCOMUtils } = ChromeUtils.import(
"resource://gre/modules/XPCOMUtils.jsm"
);
@@ -13,9 +17,11 @@ const { AppConstants } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
+#ifndef AVOID_SYSTEM_POLICIES
WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.jsm",
macOSPoliciesParser:
"resource://gre/modules/policies/macOSPoliciesParser.jsm",
+#endif
Policies: "resource:///modules/policies/Policies.jsm",
JsonSchemaValidator:
"resource://gre/modules/components-utils/JsonSchemaValidator.jsm",
@@ -140,11 +146,13 @@ EnterprisePoliciesManager.prototype = {
_chooseProvider() {
let platformProvider = null;
+#ifndef AVOID_SYSTEM_POLICIES
if (AppConstants.platform == "win") {
platformProvider = new WindowsGPOPoliciesProvider();
} else if (AppConstants.platform == "macosx") {
platformProvider = new macOSPoliciesProvider();
}
+#endif
let jsonProvider = new JSONPoliciesProvider();
if (platformProvider && platformProvider.hasPolicies) {
if (jsonProvider.hasPolicies) {
@@ -491,7 +499,7 @@ class JSONPoliciesProvider {
_getConfigurationFile() {
let configFile = null;
-
+#ifndef AVOID_SYSTEM_POLICIES
if (AppConstants.platform == "linux") {
let systemConfigFile = Cc["@mozilla.org/file/local;1"].createInstance(
Ci.nsIFile
@@ -504,7 +512,7 @@ class JSONPoliciesProvider {
return systemConfigFile;
}
}
-
+#endif
try {
let perUserPath = Services.prefs.getBoolPref(PREF_PER_USER_DIR, false);
if (perUserPath) {
@@ -585,6 +593,7 @@ class JSONPoliciesProvider {
}
}
+#ifndef AVOID_SYSTEM_POLICIES
class WindowsGPOPoliciesProvider {
constructor() {
this._policies = null;
@@ -686,3 +695,4 @@ class CombinedProvider {
return false;
}
}
+#endif
diff --git a/toolkit/components/enterprisepolicies/moz.build
b/toolkit/components/enterprisepolicies/moz.build
index 09d2046e1bd7..3f685d3fbbd6 100644
--- a/toolkit/components/enterprisepolicies/moz.build
+++ b/toolkit/components/enterprisepolicies/moz.build
@@ -19,6 +19,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
EXTRA_JS_MODULES += [
"EnterprisePolicies.jsm",
"EnterprisePoliciesContent.jsm",
+]
+
+EXTRA_PP_JS_MODULES += [
"EnterprisePoliciesParent.jsm",
]
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 33342: Avoid disconnect search addon error after removal.
commit c4df1af0e1543a70231e65195d8f3497c9f44872
Author: Alex Catarineu
Date: Fri Mar 13 18:19:30 2020 +0100
Bug 33342: Avoid disconnect search addon error after removal.
We removed the addon in #32767, but it was still being loaded
from addonStartup.json.lz4 and throwing an error on startup
because its resource: location is not available anymore.
---
toolkit/mozapps/extensions/internal/XPIProvider.jsm | 6 ++
1 file changed, 6 insertions(+)
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index a88974f402ae..11a3497a03d1 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -959,6 +959,12 @@ var BuiltInLocation = new (class _BuiltInLocation extends
XPIStateLocation {
isLinkedAddon(/* aId */) {
return false;
}
+
+ restore(saved) {
+super.restore(saved);
+// Bug 33342: avoid restoring disconnect addon from addonStartup.json.lz4.
+this.removeAddon("disconn...@search.mozilla.org");
+ }
})();
/**
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 25741 - TBA: Disable GeckoNetworkManager
commit 4d667a3a2c5898cd00488ec2dea61213db27094b
Author: Matthew Finkel
Date: Thu Apr 26 22:22:51 2018 +
Bug 25741 - TBA: Disable GeckoNetworkManager
The browser should not need information related to the network
interface or network state, tor should take care of that.
---
.../src/main/java/org/mozilla/geckoview/GeckoRuntime.java | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
index 3852b79fc30a..12a50636e3a2 100644
---
a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
+++
b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntime.java
@@ -122,7 +122,9 @@ public final class GeckoRuntime implements Parcelable {
mPaused = false;
// Monitor network status and send change notifications to Gecko
// while active.
-
GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext());
+if (BuildConfig.TOR_BROWSER_VERSION == "") {
+
GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext());
+}
}
@OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
@@ -130,7 +132,9 @@ public final class GeckoRuntime implements Parcelable {
Log.d(LOGTAG, "Lifecycle: onPause");
mPaused = true;
// Stop monitoring network status while inactive.
-GeckoNetworkManager.getInstance().stop();
+if (BuildConfig.TOR_BROWSER_VERSION == "") {
+GeckoNetworkManager.getInstance().stop();
+}
GeckoThread.onPause();
}
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 30237: Add v3 onion services client authentication prompt
commit aed5421194b7fb8b43d27a53d08277c516a10bbd
Author: Kathy Brade
Date: Tue Nov 12 16:11:05 2019 -0500
Bug 30237: Add v3 onion services client authentication prompt
When Tor informs the browser that client authentication is needed,
temporarily load about:blank instead of about:neterror and prompt
for the user's key.
If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD
control port command to add the key (via Torbutton's control port
module) and reload the page.
If the user cancels the prompt, display the standard about:neterror
"Unable to connect" page. This requires a small change to
browser/actors/NetErrorChild.jsm to account for the fact that the
docShell no longer has the failedChannel information. The failedChannel
is used to extract TLS-related error info, which is not applicable
in the case of a canceled .onion authentication prompt.
Add a leaveOpen option to PopupNotifications.show so we can display
error messages within the popup notification doorhanger without
closing the prompt.
Add support for onion services strings to the TorStrings module.
Add support for Tor extended SOCKS errors (Tor proposal 304) to the
socket transport and SOCKS layers. Improved display of all of these
errors will be implemented as part of bug 30025.
Also fixes bug 19757:
Add a "Remember this key" checkbox to the client auth prompt.
Add an "Onion Services Authentication" section within the
about:preferences "Privacy & Security section" to allow
viewing and removal of v3 onion client auth keys that have
been stored on disk.
Also fixes bug 19251: use enhanced error pages for onion service errors.
---
browser/actors/NetErrorChild.jsm | 7 +
browser/base/content/aboutNetError.js | 10 +-
browser/base/content/aboutNetError.xhtml | 1 +
browser/base/content/browser.js| 10 +
browser/base/content/browser.xhtml | 3 +
browser/base/content/tab-content.js| 5 +
browser/components/moz.build | 1 +
.../content/authNotificationIcon.inc.xhtml | 6 +
.../onionservices/content/authPopup.inc.xhtml | 16 ++
.../onionservices/content/authPreferences.css | 20 ++
.../content/authPreferences.inc.xhtml | 19 ++
.../onionservices/content/authPreferences.js | 66 +
.../components/onionservices/content/authPrompt.js | 316 +
.../components/onionservices/content/authUtil.jsm | 47 +++
.../onionservices/content/netError/browser.svg | 3 +
.../onionservices/content/netError/network.svg | 3 +
.../content/netError/onionNetError.css | 65 +
.../content/netError/onionNetError.js | 244
.../onionservices/content/netError/onionsite.svg | 7 +
.../onionservices/content/onionservices.css| 69 +
.../onionservices/content/savedKeysDialog.js | 259 +
.../onionservices/content/savedKeysDialog.xhtml| 42 +++
browser/components/onionservices/jar.mn| 9 +
browser/components/onionservices/moz.build | 1 +
browser/components/preferences/preferences.xhtml | 1 +
browser/components/preferences/privacy.inc.xhtml | 2 +
browser/components/preferences/privacy.js | 7 +
browser/themes/shared/notification-icons.inc.css | 3 +
docshell/base/nsDocShell.cpp | 81 +-
dom/ipc/BrowserParent.cpp | 21 ++
dom/ipc/BrowserParent.h| 3 +
dom/ipc/PBrowser.ipdl | 9 +
js/xpconnect/src/xpc.msg | 10 +
netwerk/base/nsSocketTransport2.cpp| 6 +
netwerk/socket/nsSOCKSIOLayer.cpp | 49
toolkit/modules/PopupNotifications.jsm | 6 +
toolkit/modules/RemotePageAccessManager.jsm| 1 +
.../lib/environments/frame-script.js | 1 +
xpcom/base/ErrorList.py| 22 ++
39 files changed, 1449 insertions(+), 2 deletions(-)
diff --git a/browser/actors/NetErrorChild.jsm b/browser/actors/NetErrorChild.jsm
index 82978412fe24..164fb7c95cd1 100644
--- a/browser/actors/NetErrorChild.jsm
+++ b/browser/actors/NetErrorChild.jsm
@@ -13,6 +13,8 @@ const { RemotePageChild } = ChromeUtils.import(
"resource://gre/actors/RemotePageChild.jsm"
);
+const { TorStrings } =
ChromeUtils.import("resource:///modules/TorStrings.jsm");
+
XPCOMUtils.defineLazyServiceGetter(
this,
"gSerializationHelper",
@@ -33,6 +35,7 @@ class NetErrorChild extends RemotePageChild {
"RPMAddToHistogram",
"RPMRecordTelemetryEvent",
"RPMGetHttpResponseHeader",
+ "RPMGetTorStrings",
];
this.exportFunctions(exportableFunctions);
}
@@
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 32658: Create a new MAR signing key
commit 36f0fad77dfab38e4137fc27b43fa200dbe870ee Author: Georg Koppen Date: Fri Jan 17 12:54:31 2020 + Bug 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. Bug 33803: Move our primary nightly MAR signing key to tor-browser Bug 33803: Add a secondary nightly MAR signing key --- .../update/updater/nightly_aurora_level3_primary.der | Bin 1225 -> 1245 bytes .../updater/nightly_aurora_level3_secondary.der | Bin 1225 -> 1245 bytes toolkit/mozapps/update/updater/release_primary.der| Bin 1225 -> 1229 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 1225 -> 1229 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der b/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der index 44fd95dcff89..d579cf801e1a 100644 Binary files a/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der and b/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der differ diff --git a/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der b/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der index 90f8e6e82c63..7cbfa77d06e7 100644 Binary files a/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der and b/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der differ diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index 1d94f88ad73b..0103a171de88 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index 474706c4b73c..fcee3944e9b7 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 27604: Fix addon issues when moving TB directory
commit c6bbc3a6b477fd9af9ae6a10a21ea90cc598d0d4
Author: Alex Catarineu
Date: Wed Oct 30 10:44:48 2019 +0100
Bug 27604: Fix addon issues when moving TB directory
---
toolkit/mozapps/extensions/internal/XPIProvider.jsm | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index a9f708331c9a..a88974f402ae 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -475,7 +475,7 @@ class XPIState {
// Builds prior to be 1512436 did not include the rootURI property.
// If we're updating from such a build, add that property now.
-if (!("rootURI" in this) && this.file) {
+if (this.file) {
this.rootURI = getURIForResourceInFile(this.file, "").spec;
}
@@ -488,7 +488,10 @@ class XPIState {
saved.currentModifiedTime != this.lastModifiedTime
) {
this.lastModifiedTime = saved.currentModifiedTime;
-} else if (saved.currentModifiedTime === null) {
+} else if (
+ saved.currentModifiedTime === null &&
+ (!this.file || !this.file.exists())
+) {
this.missing = true;
}
}
@@ -1449,6 +1452,7 @@ var XPIStates = {
if (shouldRestoreLocationData && oldState[loc.name]) {
loc.restore(oldState[loc.name]);
+changed = changed || loc.path != oldState[loc.name].path;
}
changed = changed || loc.changed;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 32092: Fix Tor Browser Support link in preferences
commit 10eaeefa5e23231d2dcc73044a708737203a2997
Author: Alex Catarineu
Date: Tue Oct 15 22:54:10 2019 +0200
Bug 32092: Fix Tor Browser Support link in preferences
---
browser/components/preferences/preferences.js | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/browser/components/preferences/preferences.js
b/browser/components/preferences/preferences.js
index a89fddd0306d..ce338584142e 100644
--- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js
@@ -166,10 +166,7 @@ function init_all() {
gotoPref().then(() => {
let helpButton = document.getElementById("helpButton");
-let helpUrl =
- Services.urlFormatter.formatURLPref("app.support.baseURL") +
- "preferences";
-helpButton.setAttribute("href", helpUrl);
+helpButton.setAttribute("href", "https://support.torproject.org/tbb;);
document.getElementById("addonsButton").addEventListener("click", e => {
if (e.button >= 2) {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 32220: Improve the letterboxing experience
commit 90b85373bc7cf955f26db2bcdf17123c56abe52b
Author: Richard Pospesel
Date: Mon Oct 28 17:42:17 2019 -0700
Bug 32220: Improve the letterboxing experience
CSS and JS changes to alter the UX surrounding letterboxing. The
browser element containing page content is now anchored to the bottom
of the toolbar, and the remaining letterbox margin is the same color
as the firefox chrome. The letterbox margin and border are tied to
the currently selected theme.
Also adds a 'needsLetterbox' property to tabbrowser.xml to fix a race
condition present when using the 'isEmpty' property. Using 'isEmpty'
as a proxy for 'needsLetterbox' resulted in over-zealous/unnecessary
letterboxing of about:blank tabs.
---
browser/base/content/browser.css | 8 ++
browser/base/content/tabbrowser-tab.js | 9 +++
browser/themes/shared/tabs.inc.css | 6 ++
.../components/resistfingerprinting/RFPHelper.jsm | 94 +++---
4 files changed, 105 insertions(+), 12 deletions(-)
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index e6879a99a7e3..b2c881a4997e 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -99,6 +99,14 @@ body {
display: none;
}
+
+.browserStack > browser.letterboxing {
+ border-color: var(--chrome-content-separator-color);
+ border-style: solid;
+ border-width : 1px;
+ border-top: none;
+}
+
%ifdef MENUBAR_CAN_AUTOHIDE
#toolbar-menubar[autohide="true"] {
overflow: hidden;
diff --git a/browser/base/content/tabbrowser-tab.js
b/browser/base/content/tabbrowser-tab.js
index 448878d9855f..ccc30cae1e3a 100644
--- a/browser/base/content/tabbrowser-tab.js
+++ b/browser/base/content/tabbrowser-tab.js
@@ -257,6 +257,15 @@
return true;
}
+get needsLetterbox() {
+ let browser = this.linkedBrowser;
+ if (isBlankPageURL(browser.currentURI.spec)) {
+return false;
+ }
+
+ return true;
+}
+
get lastAccessed() {
return this._lastAccessed == Infinity ? Date.now() : this._lastAccessed;
}
diff --git a/browser/themes/shared/tabs.inc.css
b/browser/themes/shared/tabs.inc.css
index 9b4e72e3a9e9..81785a8b4c5f 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -46,6 +46,12 @@
background-color: #f9f9fa;
}
+/* extend down the toolbar's colors when letterboxing is enabled*/
+#tabbrowser-tabpanels.letterboxing {
+ background-color: var(--toolbar-bgcolor);
+ background-image: var(--toolbar-bgimage);
+}
+
:root[privatebrowsingmode=temporary] #tabbrowser-tabpanels {
/* Value for --in-content-page-background in aboutPrivateBrowsing.css */
background-color: #25003e;
diff --git a/toolkit/components/resistfingerprinting/RFPHelper.jsm
b/toolkit/components/resistfingerprinting/RFPHelper.jsm
index 166ad21e9013..9520d8720631 100644
--- a/toolkit/components/resistfingerprinting/RFPHelper.jsm
+++ b/toolkit/components/resistfingerprinting/RFPHelper.jsm
@@ -40,6 +40,7 @@ class _RFPHelper {
//
constructor() {
this._initialized = false;
+this._borderDimensions = null;
}
init() {
@@ -361,6 +362,24 @@ class _RFPHelper {
});
}
+ getBorderDimensions(aBrowser) {
+if (this._borderDimensions) {
+ return this._borderDimensions;
+}
+
+const win = aBrowser.ownerGlobal;
+const browserStyle = win.getComputedStyle(aBrowser);
+
+this._borderDimensions = {
+ top : parseInt(browserStyle.borderTopWidth),
+ right: parseInt(browserStyle.borderRightWidth),
+ bottom : parseInt(browserStyle.borderBottomWidth),
+ left : parseInt(browserStyle.borderLeftWidth),
+};
+
+return this._borderDimensions;
+ }
+
_addOrClearContentMargin(aBrowser) {
let tab = aBrowser.getTabBrowser().getTabForBrowser(aBrowser);
@@ -369,9 +388,13 @@ class _RFPHelper {
return;
}
+// we add the letterboxing class even if the content does not need
letterboxing
+// in which case margins are set such that the borders are hidden
+aBrowser.classList.add("letterboxing");
+
// We should apply no margin around an empty tab or a tab with system
// principal.
-if (tab.isEmpty || aBrowser.contentPrincipal.isSystemPrincipal) {
+if (!tab.needsLetterbox || aBrowser.contentPrincipal.isSystemPrincipal) {
this._clearContentViewMargin(aBrowser);
} else {
this._roundContentView(aBrowser);
@@ -539,10 +562,29 @@ class _RFPHelper {
// Calculating the margins around the browser element in order to round the
// content viewport. We will use a 200x100 stepping if the dimension set
// is not given.
-let margins = calcMargins(containerWidth, containerHeight);
+
+const borderDimensions = this.getBorderDimensions(aBrowser);
+const marginDims =
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
commit fdadcca27c3135b69168f5b489668463937e68eb
Author: Amogh Pradeep
Date: Fri Jun 12 02:07:45 2015 -0400
Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
See Bug 1357997 for partial uplift.
Also:
Bug 28051 - Use our Orbot for proxying our connections
Bug 31144 - ESR68 Network Code Review
---
.../java/org/mozilla/gecko/util/ProxySelector.java | 25 +-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
index dbd07a069de1..800c7cf96de8 100644
---
a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
+++
b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/util/ProxySelector.java
@@ -29,6 +29,10 @@ import java.net.URLConnection;
import java.util.List;
public class ProxySelector {
+private static final String TOR_PROXY_ADDRESS = "127.0.0.1";
+private static final int TOR_SOCKS_PROXY_PORT = 9150;
+private static final int TOR_HTTP_PROXY_PORT = 8218;
+
public static URLConnection openConnectionWithProxy(final URI uri) throws
IOException {
final java.net.ProxySelector ps = java.net.ProxySelector.getDefault();
Proxy proxy = Proxy.NO_PROXY;
@@ -39,7 +43,26 @@ public class ProxySelector {
}
}
-return uri.toURL().openConnection(proxy);
+/* Ignore the proxy we found from the VM, only use Tor. We can probably
+ * safely use the logic in this class in the future. */
+return uri.toURL().openConnection(getProxy());
+}
+
+public static Proxy getProxy() {
+// TODO make configurable
+return new Proxy(Proxy.Type.SOCKS, new
InetSocketAddress(TOR_PROXY_ADDRESS, TOR_SOCKS_PROXY_PORT));
+}
+
+public static String getProxyHostAddress() {
+return TOR_PROXY_ADDRESS;
+}
+
+public static int getSocksProxyPort() {
+return TOR_SOCKS_PROXY_PORT;
+}
+
+public static int getHttpProxyPort() {
+return TOR_HTTP_PROXY_PORT;
}
public ProxySelector() {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 31575: Replace Firefox Home (newtab) with about:tor
commit e0ef89af5547608388ceeae4acfd124b45f1d3fb
Author: Alex Catarineu
Date: Mon Sep 9 13:04:34 2019 +0200
Bug 31575: Replace Firefox Home (newtab) with about:tor
Avoid loading AboutNewTab in BrowserGlue.jsm in order
to avoid several network requests that we do not need. Besides,
about:newtab will now point to about:blank or about:tor (depending
on browser.newtabpage.enabled) and about:home will point to
about:tor.
---
browser/components/BrowserGlue.jsm | 33 ++--
browser/components/newtab/AboutNewTabService.jsm | 15 +--
browser/components/preferences/home.inc.xhtml| 4 +--
browser/components/preferences/preferences.xhtml | 5 +++-
browser/modules/HomePage.jsm | 2 +-
5 files changed, 10 insertions(+), 49 deletions(-)
diff --git a/browser/components/BrowserGlue.jsm
b/browser/components/BrowserGlue.jsm
index 231bb540921b..10c789d822f7 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -18,7 +18,6 @@ const { AppConstants } = ChromeUtils.import(
);
XPCOMUtils.defineLazyModuleGetters(this, {
- AboutNewTab: "resource:///modules/AboutNewTab.jsm",
ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm",
AddonManager: "resource://gre/modules/AddonManager.jsm",
AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
@@ -225,28 +224,6 @@ let JSWINDOWACTORS = {
matches: ["about:newinstall"],
},
- AboutNewTab: {
-parent: {
- moduleURI: "resource:///actors/AboutNewTabParent.jsm",
-},
-child: {
- moduleURI: "resource:///actors/AboutNewTabChild.jsm",
- events: {
-DOMContentLoaded: {},
-pageshow: {},
-visibilitychange: {},
- },
-},
-// The wildcard on about:newtab is for the ?endpoint query parameter
-// that is used for snippets debugging. The wildcard for about:home
-// is similar, and also allows for falling back to loading the
-// about:home document dynamically if an attempt is made to load
-// about:home?jscache from the AboutHomeStartupCache as a top-level
-// load.
-matches: ["about:home*", "about:welcome", "about:newtab*"],
-remoteTypes: ["privilegedabout"],
- },
-
AboutPlugins: {
parent: {
moduleURI: "resource:///actors/AboutPluginsParent.jsm",
@@ -1650,8 +1627,6 @@ BrowserGlue.prototype = {
// the first browser window has finished initializing
_onFirstWindowLoaded: function BG__onFirstWindowLoaded(aWindow) {
-AboutNewTab.init();
-
TabCrashHandler.init();
ProcessHangMonitor.init();
@@ -5142,12 +5117,8 @@ var AboutHomeStartupCache = {
return { pageInputStream: null, scriptInputStream: null };
}
-let state = AboutNewTab.activityStream.store.getState();
-return new Promise(resolve => {
- this._cacheDeferred = resolve;
- this.log.trace("Parent is requesting cache streams.");
- this._procManager.sendAsyncMessage(this.CACHE_REQUEST_MESSAGE, { state
});
-});
+this.log.error("Activity Stream is disabled in Tor Browser.");
+return { pageInputStream: null, scriptInputStream: null };
},
/**
diff --git a/browser/components/newtab/AboutNewTabService.jsm
b/browser/components/newtab/AboutNewTabService.jsm
index 605d34c0de1c..3f4f04a386db 100644
--- a/browser/components/newtab/AboutNewTabService.jsm
+++ b/browser/components/newtab/AboutNewTabService.jsm
@@ -425,20 +425,7 @@ class BaseAboutNewTabService {
* the newtab page has no effect on the result of this function.
*/
get defaultURL() {
-// Generate the desired activity stream resource depending on state, e.g.,
-// "resource://activity-stream/prerendered/activity-stream.html"
-// "resource://activity-stream/prerendered/activity-stream-debug.html"
-// "resource://activity-stream/prerendered/activity-stream-noscripts.html"
-return [
- "resource://activity-stream/prerendered/",
- "activity-stream",
- // Debug version loads dev scripts but noscripts separately loads scripts
- this.activityStreamDebug && !this.privilegedAboutProcessEnabled
-? "-debug"
-: "",
- this.privilegedAboutProcessEnabled ? "-noscripts" : "",
- ".html",
-].join("");
+return "about:tor";
}
get welcomeURL() {
diff --git a/browser/components/preferences/home.inc.xhtml
b/browser/components/preferences/home.inc.xhtml
index c348e1cf754b..c37dc5e731f6 100644
--- a/browser/components/preferences/home.inc.xhtml
+++ b/browser/components/preferences/home.inc.xhtml
@@ -33,7 +33,7 @@
class="check-home-page-controlled"
data-preference-related="browser.startup.homepage">
-
+
@@ -85,7 +85,7 @@
Preferences so we need to handle setting the pref manually.-->
-
+
diff --git
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 27511: Add new identity button to toolbar
commit 7560aae429a296ded26670e92b442ee860bae8e5
Author: Alex Catarineu
Date: Fri Oct 4 19:08:33 2019 +0200
Bug 27511: Add new identity button to toolbar
Also added 'New circuit for this site' button to CustomizableUI, but
not visible by default.
---
browser/base/content/browser.xhtml | 10 ++
.../components/customizableui/CustomizableUI.jsm| 21 +
browser/themes/shared/icons/new_circuit.svg | 8
browser/themes/shared/icons/new_identity.svg| 9 +
browser/themes/shared/jar.inc.mn| 3 +++
browser/themes/shared/menupanel.inc.css | 8
browser/themes/shared/toolbarbutton-icons.inc.css | 8
7 files changed, 67 insertions(+)
diff --git a/browser/base/content/browser.xhtml
b/browser/base/content/browser.xhtml
index c859d65af413..4c3a7e7cae55 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -2281,6 +2281,16 @@
ondragenter="newWindowButtonObserver.onDragOver(event)"
ondragexit="newWindowButtonObserver.onDragExit(event)"/>
+
+
+
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+Icon / New Circuit@1.5x
+
+
+
+
+
diff --git a/browser/themes/shared/icons/new_identity.svg
b/browser/themes/shared/icons/new_identity.svg
new file mode 100644
index ..91d5b35f7e80
--- /dev/null
+++ b/browser/themes/shared/icons/new_identity.svg
@@ -0,0 +1,9 @@
+
+http://www.w3.org/2000/svg; xmlns:xlink="http://www.w3.org/1999/xlink;>
+New Identity Icon
+
+
+
+
+
+
\ No newline at end of file
diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
index cbf18156a455..5b41d65ebd45 100644
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -272,3 +272,6 @@
skin/classic/browser/places/tree-icons.css
(../shared/places/tree-icons.css)
skin/classic/browser/privatebrowsing/aboutPrivateBrowsing.css
(../shared/privatebrowsing/aboutPrivateBrowsing.css)
skin/classic/browser/privatebrowsing/favicon.svg
(../shared/privatebrowsing/favicon.svg)
+
+ skin/classic/browser/new_circuit.svg
(../shared/icons/new_circuit.svg)
+ skin/classic/browser/new_identity.svg
(../shared/icons/new_identity.svg)
diff --git a/browser/themes/shared/menupanel.inc.css
b/browser/themes/shared/menupanel.inc.css
index d5079e9881f2..91dae3481f2e 100644
--- a/browser/themes/shared/menupanel.inc.css
+++ b/browser/themes/shared/menupanel.inc.css
@@ -195,3 +195,11 @@ toolbarpaletteitem[place="palette"] >
#bookmarks-menu-button,
list-style-image: url(chrome://browser/skin/fullscreen-exit.svg);
}
} /** END Proton **/
+
+#appMenuNewIdentity {
+ list-style-image: url("chrome://browser/skin/new_identity.svg");
+}
+
+#appMenuNewCircuit {
+ list-style-image: url("chrome://browser/skin/new_circuit.svg");
+}
diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css
b/browser/themes/shared/toolbarbutton-icons.inc.css
index 3d4fd8192898..d81d7f7b2dcf 100644
--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -203,6 +203,14 @@ toolbar[brighttext] {
list-style-image: url("chrome://browser/skin/new-tab.svg");
}
+#new-identity-button {
+ list-style-image: url("chrome://browser/skin/new_identity.svg");
+}
+
+#new-circuit-button {
+ list-style-image: url("chrome://browser/skin/new_circuit.svg");
+}
+
#privatebrowsing-button {
list-style-image: url("chrome://browser/skin/privateBrowsing.svg");
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 26353: Prevent speculative connect that violated FPI.
commit 6c8dcefee6363058dab35eaf7eaa5fa65b45c9e5
Author: Arthur Edelstein
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 568e70688dc4..e1adbc72bdad 100644
--- a/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
+++ b/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm
@@ -93,6 +93,9 @@ class RemoteWebNavigation {
}
uri = Services.uriFixup.getFixupURIInfo(aURI, fixupFlags).preferredURI;
+/***
+ 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.
@@ -116,6 +119,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.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 25658: Replace security slider with security level UI
commit 88058c1d107f13928131de57ff8fa15ff024bdba
Author: Richard Pospesel
Date: Mon Mar 4 16:09:51 2019 -0800
Bug 25658: Replace security slider with security level UI
This patch adds a new 'securitylevel' component to Tor Browser intended
to replace the torbutton 'Security Slider'.
This component adds a new Security Level toolbar button which visually
indicates the current global security level via icon (as defined by the
extensions.torbutton.security_slider pref), a drop-down hanger with a
short description of the current security level, and a new section in
the about:preferences#privacy page where users can change their current
security level. In addition, the hanger and the preferences page will
show a visual warning when the user has modified prefs associated with
the security level and provide a one-click 'Restore Defaults' button to
get the user back on recommended settings.
Strings used by this patch are pulled from the torbutton extension, but
en-US defaults are provided if there is an error loading from the
extension. With this patch applied, the usual work-flow of "./mach build
&& ./mach run" work as expected, even if the torbutton extension is
disabled.
---
browser/base/content/browser.js| 10 +
browser/base/content/browser.xhtml | 5 +
browser/components/moz.build | 1 +
browser/components/preferences/preferences.xhtml | 1 +
browser/components/preferences/privacy.inc.xhtml | 2 +
browser/components/preferences/privacy.js | 19 +
.../securitylevel/content/securityLevel.js | 501 +
.../securitylevel/content/securityLevelButton.css | 9 +
.../content/securityLevelButton.inc.xhtml | 7 +
.../securitylevel/content/securityLevelButton.svg | 21 +
.../securitylevel/content/securityLevelPanel.css | 82
.../content/securityLevelPanel.inc.xhtml | 38 ++
.../content/securityLevelPreferences.css | 26 ++
.../content/securityLevelPreferences.inc.xhtml | 62 +++
browser/components/securitylevel/jar.mn| 6 +
browser/components/securitylevel/moz.build | 1 +
16 files changed, 791 insertions(+)
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 56537664068a..7d2727b262d5 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -223,6 +223,11 @@ XPCOMUtils.defineLazyScriptGetter(
["DownloadsButton", "DownloadsIndicatorView"],
"chrome://browser/content/downloads/indicator.js"
);
+XPCOMUtils.defineLazyScriptGetter(
+ this,
+ ["SecurityLevelButton"],
+ "chrome://browser/content/securitylevel/securityLevel.js"
+);
XPCOMUtils.defineLazyScriptGetter(
this,
"gEditItemOverlay",
@@ -1837,6 +1842,9 @@ var gBrowserInit = {
// doesn't flicker as the window is being shown.
DownloadsButton.init();
+// Init the SecuritySettingsButton
+SecurityLevelButton.init();
+
// Certain kinds of automigration rely on this notification to complete
// their tasks BEFORE the browser window is shown. SessionStore uses it to
// restore tabs into windows AFTER important parts like
gMultiProcessBrowser
@@ -2564,6 +2572,8 @@ var gBrowserInit = {
DownloadsButton.uninit();
+SecurityLevelButton.uninit();
+
gAccessibilityServiceIndicator.uninit();
if (gToolbarKeyNavEnabled) {
diff --git a/browser/base/content/browser.xhtml
b/browser/base/content/browser.xhtml
index 3b9fc7e45b74..f8381a5dad9e 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -20,6 +20,8 @@
+
+
@@ -656,6 +658,7 @@
#include ../../components/controlcenter/content/protectionsPanel.inc.xhtml
#include ../../components/downloads/content/downloadsPanel.inc.xhtml
#include ../../../devtools/startup/enableDevToolsPopup.inc.xhtml
+#include ../../components/securitylevel/content/securityLevelPanel.inc.xhtml
#include browser-allTabsMenu.inc.xhtml
@@ -2104,6 +2107,8 @@
+#include ../../components/securitylevel/content/securityLevelButton.inc.xhtml
+
+
diff --git a/browser/components/preferences/privacy.inc.xhtml
b/browser/components/preferences/privacy.inc.xhtml
index f1dd462289bb..a2ef0edb26f3 100644
--- a/browser/components/preferences/privacy.inc.xhtml
+++ b/browser/components/preferences/privacy.inc.xhtml
@@ -924,6 +924,8 @@
+#include ../securitylevel/content/securityLevelPreferences.inc.xhtml
+
diff --git a/browser/components/preferences/privacy.js
b/browser/components/preferences/privacy.js
index 87006eea83e3..8401d4d101e4 100644
--- a/browser/components/preferences/privacy.js
+++ b/browser/components/preferences/privacy.js
@@ -80,6 +80,12 @@ XPCOMUtils.defineLazyGetter(this, "AlertsServiceDND",
function() {
}
});
+XPCOMUtils.defineLazyScriptGetter(
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 28369: Stop shipping pingsender executable
commit 89bd677a1682f9e18594fc8611b67b3b9ce70294
Author: Alex Catarineu
Date: Wed Apr 10 17:52:51 2019 +0200
Bug 28369: Stop shipping pingsender executable
---
browser/app/macbuild/Contents/MacOS-files.in | 1 -
browser/installer/package-manifest.in | 4
browser/installer/windows/nsis/shared.nsh | 1 -
python/mozbuild/mozbuild/artifacts.py | 2 --
toolkit/components/telemetry/app/TelemetrySend.jsm | 19 +--
toolkit/components/telemetry/moz.build | 4
6 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/browser/app/macbuild/Contents/MacOS-files.in
b/browser/app/macbuild/Contents/MacOS-files.in
index 6f0b4481473b..6e8a1689ea19 100644
--- a/browser/app/macbuild/Contents/MacOS-files.in
+++ b/browser/app/macbuild/Contents/MacOS-files.in
@@ -17,7 +17,6 @@
#if defined(MOZ_CRASHREPORTER)
/minidump-analyzer
#endif
-/pingsender
/pk12util
/ssltunnel
/xpcshell
diff --git a/browser/installer/package-manifest.in
b/browser/installer/package-manifest.in
index 27424c5d7fcd..0754508f8693 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -452,10 +452,6 @@ bin/libfreebl_64int_3.so
@BINPATH@/minidump-analyzer@BIN_SUFFIX@
#endif
-; [ Ping Sender ]
-;
-@BINPATH@/pingsender@BIN_SUFFIX@
-
; Shutdown Terminator
@RESPATH@/components/terminator.manifest
diff --git a/browser/installer/windows/nsis/shared.nsh
b/browser/installer/windows/nsis/shared.nsh
index 74e1c0c7141e..c5181b8d7ae6 100755
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -1475,7 +1475,6 @@ ${RemoveDefaultBrowserAgentShortcut}
Push "crashreporter.exe"
Push "default-browser-agent.exe"
Push "minidump-analyzer.exe"
- Push "pingsender.exe"
Push "updater.exe"
Push "${FileMainEXE}"
!macroend
diff --git a/python/mozbuild/mozbuild/artifacts.py
b/python/mozbuild/mozbuild/artifacts.py
index 50ca81a4aaf5..3f3454b4b7b5 100644
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -495,7 +495,6 @@ class LinuxArtifactJob(ArtifactJob):
"{product}/{product}",
"{product}/{product}-bin",
"{product}/minidump-analyzer",
-"{product}/pingsender",
"{product}/plugin-container",
"{product}/updater",
"{product}/**/*.so",
@@ -550,7 +549,6 @@ class MacArtifactJob(ArtifactJob):
"{product}-bin",
"*.dylib",
"minidump-analyzer",
-"pingsender",
"plugin-container.app/Contents/MacOS/plugin-container",
"updater.app/Contents/MacOS/org.mozilla.updater",
# 'xpcshell',
diff --git a/toolkit/components/telemetry/app/TelemetrySend.jsm
b/toolkit/components/telemetry/app/TelemetrySend.jsm
index d64da6858124..ba125ea6a459 100644
--- a/toolkit/components/telemetry/app/TelemetrySend.jsm
+++ b/toolkit/components/telemetry/app/TelemetrySend.jsm
@@ -1588,23 +1588,6 @@ var TelemetrySendImpl = {
},
runPingSender(pings, observer) {
-if (AppConstants.platform === "android") {
- throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
-}
-
-const exeName =
- AppConstants.platform === "win" ? "pingsender.exe" : "pingsender";
-
-let exe = Services.dirsvc.get("GreBinD", Ci.nsIFile);
-exe.append(exeName);
-
-let params = pings.flatMap(ping => [ping.url, ping.path]);
-let process = Cc["@mozilla.org/process/util;1"].createInstance(
- Ci.nsIProcess
-);
-process.init(exe);
-process.startHidden = true;
-process.noShell = true;
-process.runAsync(params, params.length, observer);
+throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED);
},
};
diff --git a/toolkit/components/telemetry/moz.build
b/toolkit/components/telemetry/moz.build
index 32e670b76b18..21fe4e8c71eb 100644
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -8,10 +8,6 @@ include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = "xul"
-DIRS = [
-"pingsender",
-]
-
DEFINES["MOZ_APP_VERSION"] = '"%s"' % CONFIG["MOZ_APP_VERSION"]
LOCAL_INCLUDES += [
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 21830: Copying large text from web console leaks to /tmp
commit 8c54d04ce1d134d0cadf876e78f7e9359587dbce
Author: Georg Koppen
Date: Fri Aug 4 05:55:49 2017 +
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 c82549a4d1d1..f8ecfbff0983 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;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 30541: Disable WebGL readPixel() for web content
commit af4c8d2f465aed20e4e64bca47cf77f2fbb965c0
Author: Georg Koppen
Date: Wed May 29 12:29:19 2019 +
Bug 30541: Disable WebGL readPixel() for web content
---
dom/canvas/ClientWebGLContext.cpp | 8
1 file changed, 8 insertions(+)
diff --git a/dom/canvas/ClientWebGLContext.cpp
b/dom/canvas/ClientWebGLContext.cpp
index b940b69fd7bc..d3fe79beec38 100644
--- a/dom/canvas/ClientWebGLContext.cpp
+++ b/dom/canvas/ClientWebGLContext.cpp
@@ -4619,6 +4619,14 @@ bool ClientWebGLContext::ReadPixels_SharedPrecheck(
return false;
}
+ // Security check passed, but don't let content readPixel calls through for
+ // now, if Resist Fingerprinting Mode is enabled.
+ if (nsContentUtils::ResistFingerprinting(aCallerType)) {
+JsWarning("readPixels: Not allowed in Resist Fingerprinting Mode");
+out_error.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+return false;
+ }
+
return true;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 23247: Communicating security expectations for .onion
commit cb846dbb65560ce490047ee76ff1a0b4c9d209d3
Author: Richard Pospesel
Date: Fri Jun 8 13:38:40 2018 -0700
Bug 23247: Communicating security expectations for .onion
Encrypting pages hosted on Onion Services with SSL/TLS is redundant
(in terms of hiding content) as all traffic within the Tor network is
already fully encrypted. Therefore, serving HTTP pages from an Onion
Service is more or less fine.
Prior to this patch, Tor Browser would mostly treat pages delivered
via Onion Services as well as pages delivered in the ordinary fashion
over the internet in the same way. This created some inconsistencies
in behaviour and misinformation presented to the user relating to the
security of pages delivered via Onion Services:
- HTTP Onion Service pages did not have any 'lock' icon indicating
the site was secure
- HTTP Onion Service pages would be marked as unencrypted in the Page
Info screen
- Mixed-mode content restrictions did not apply to HTTP Onion Service
pages embedding Non-Onion HTTP content
This patch fixes the above issues, and also adds several new 'Onion'
icons to the mix to indicate all of the various permutations of Onion
Services hosted HTTP or HTTPS pages with HTTP or HTTPS content.
Strings for Onion Service Page Info page are pulled from Torbutton's
localization strings.
---
browser/base/content/browser-siteIdentity.js | 39 -
browser/base/content/pageinfo/security.js | 64 ++
.../shared/identity-block/identity-block.inc.css | 19 +++
.../themes/shared/identity-block/onion-slash.svg | 5 ++
.../themes/shared/identity-block/onion-warning.svg | 6 ++
browser/themes/shared/identity-block/onion.svg | 3 +
browser/themes/shared/jar.inc.mn | 3 +
dom/base/nsContentUtils.cpp| 19 +++
dom/base/nsContentUtils.h | 5 ++
dom/base/nsGlobalWindowOuter.cpp | 3 +-
dom/ipc/WindowGlobalActor.cpp | 5 +-
dom/ipc/WindowGlobalChild.cpp | 6 +-
dom/security/nsMixedContentBlocker.cpp | 16 +-
.../modules/geckoview/GeckoViewProgress.jsm| 4 ++
security/manager/ssl/nsSecureBrowserUI.cpp | 12
15 files changed, 178 insertions(+), 31 deletions(-)
diff --git a/browser/base/content/browser-siteIdentity.js
b/browser/base/content/browser-siteIdentity.js
index c17d6c76394b..370e2af9477b 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -140,6 +140,10 @@ var gIdentityHandler = {
);
},
+ get _uriIsOnionHost() {
+return this._uriHasHost ? this._uri.host.toLowerCase().endsWith(".onion")
: false;
+ },
+
get _isAboutNetErrorPage() {
return (
gBrowser.selectedBrowser.documentURI &&
@@ -735,9 +739,9 @@ var gIdentityHandler = {
get pointerlockFsWarningClassName() {
// Note that the fullscreen warning does not handle _isSecureInternalUI.
if (this._uriHasHost && this._isSecureConnection) {
- return "verifiedDomain";
+ return this._uriIsOnionHost ? "onionVerifiedDomain" : "verifiedDomain";
}
-return "unknownIdentity";
+return this._uriIsOnionHost ? "onionUnknownIdentity" : "unknownIdentity";
},
/**
@@ -745,6 +749,10 @@ var gIdentityHandler = {
* built-in (returns false) or imported (returns true).
*/
_hasCustomRoot() {
+if (!this._secInfo) {
+ return false;
+}
+
let issuerCert = null;
issuerCert = this._secInfo.succeededCertChain[
this._secInfo.succeededCertChain.length - 1
@@ -787,11 +795,13 @@ var gIdentityHandler = {
"identity.extension.label",
[extensionName]
);
-} else if (this._uriHasHost && this._isSecureConnection) {
+} else if (this._uriHasHost && this._isSecureConnection && this._secInfo) {
// This is a secure connection.
- this._identityBox.className = "verifiedDomain";
+ // _isSecureConnection implicitly includes onion services, which may not
have an SSL certificate
+ const uriIsOnionHost = this._uriIsOnionHost;
+ this._identityBox.className = uriIsOnionHost ? "onionVerifiedDomain" :
"verifiedDomain";
if (this._isMixedActiveContentBlocked) {
-this._identityBox.classList.add("mixedActiveBlocked");
+this._identityBox.classList.add(uriIsOnionHost ?
"onionMixedActiveBlocked" : "mixedActiveBlocked");
}
if (!this._isCertUserOverridden) {
// It's a normal cert, verifier is the CA Org.
@@ -802,17 +812,17 @@ var gIdentityHandler = {
}
} else if (this._isBrokenConnection) {
// This is a secure connection, but something is wrong.
- this._identityBox.className = "unknownIdentity";
+ const uriIsOnionHost = this._uriIsOnionHost;
+ this._identityBox.className =
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 23104: Add a default line height compensation
commit 79899765deded0eb0c730a20e0ed5a2f05c2d1f1
Author: Igor Oliveira
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 4ab0a5d0ecb7..61d303e95438 100644
--- a/layout/generic/ReflowInput.cpp
+++ b/layout/generic/ReflowInput.cpp
@@ -31,6 +31,7 @@
#include "mozilla/SVGUtils.h"
#include "mozilla/dom/HTMLInputElement.h"
#include "nsGridContainerFrame.h"
+#include "nsContentUtils.h"
using namespace mozilla;
using namespace mozilla::css;
@@ -2651,7 +2652,8 @@ void ReflowInput::CalculateBlockSideMargins() {
// 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;
@@ -2659,6 +2661,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;
@@ -2676,7 +2684,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) {
@@ -2705,7 +2714,7 @@ static inline nscoord ComputeLineHeight(ComputedStyle*
aComputedStyle,
RefPtr fm = nsLayoutUtils::GetFontMetricsForComputedStyle(
aComputedStyle, aPresContext, aFontSizeInflation);
- return GetNormalLineHeight(fm);
+ return GetNormalLineHeight(aContent, fm);
}
nscoord ReflowInput::CalcLineHeight() const {
@@ -2727,7 +2736,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");
@@ -2740,7 +2749,7 @@ nscoord ReflowInput::CalcLineHeight(nsIContent* aContent,
if (!lh.IsNormal()) {
RefPtr 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 072b11da7eb6..3c377e0781ed 100644
--- a/layout/generic/test/mochitest.ini
+++ b/layout/generic/test/mochitest.ini
@@ -145,3 +145,4 @@ skip-if = debug == true || tsan # the test is slow. tsan:
bug 1612707
support-files =
file_reframe_for_lazy_load_image.html
[test_bug1655135.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 ..8ff1d2190c45
--- /dev/null
+++ b/layout/generic/test/test_tor_bug23104.html
@@ -0,0 +1,50 @@
+
+
+
+
+ Test for Tor Bug #23104:
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 21431: Clean-up system extensions shipped in Firefox
commit 38b08fc46776a6a86fe98746547f23ddfd75040c
Author: Kathy Brade
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 | 9 +
browser/installer/package-manifest.in | 1 -
browser/locales/Makefile.in | 8
browser/locales/jar.mn| 7 ---
5 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/browser/components/BrowserGlue.jsm
b/browser/components/BrowserGlue.jsm
index 29f2b7328f6b..231bb540921b 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -2007,6 +2007,9 @@ BrowserGlue.prototype = {
const ID = "screensh...@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 });
@@ -2023,6 +2026,9 @@ BrowserGlue.prototype = {
const ID = "webcompat-repor...@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 9daae31eca43..8b16ddc4a84a 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -4,14 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-DIRS += [
-"doh-rollout",
-"formautofill",
-"screenshots",
-"webcompat",
-"report-site-issue",
-"pictureinpicture",
-]
+DIRS += []
if not CONFIG["TOR_BROWSER_DISABLE_TOR_LAUNCHER"]:
DIRS += ["tor-launcher"]
diff --git a/browser/installer/package-manifest.in
b/browser/installer/package-manifest.in
index b752f985c4c2..27424c5d7fcd 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -275,7 +275,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 496379c4306f..0946188813da 100644
--- a/browser/locales/Makefile.in
+++ b/browser/locales/Makefile.in
@@ -58,10 +58,6 @@ l10n-%:
@$(MAKE) -C ../../toolkit/locales l10n-$*
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) l10n 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 2aecae56bdca..934205ce6e15 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -53,10 +53,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
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 16940: After update, load local change notes.
commit 9174d97cd460ed77efb014e68d3a29c64e7045ad
Author: Kathy Brade
Date: Wed Nov 25 11:36:20 2015 -0500
Bug 16940: After update, load local change notes.
Add an about:tbupdate page that displays the first section from
TorBrowser/Docs/ChangeLog.txt and includes a link to the remote
post-update page (typically our blog entry for the release).
Always load about:tbupdate in a content process, but implement the
code that reads the file system (changelog) in the chrome process
for compatibility with future sandboxing efforts.
Also fix bug 29440. Now about:tbupdate is styled as a fairly simple
changelog page that is designed to be displayed via a link that is on
about:tor.
---
browser/actors/AboutTBUpdateChild.jsm | 12 +++
browser/actors/AboutTBUpdateParent.jsm | 120 +
browser/actors/moz.build | 6 ++
.../base/content/abouttbupdate/aboutTBUpdate.css | 74 +
.../base/content/abouttbupdate/aboutTBUpdate.js| 27 +
.../base/content/abouttbupdate/aboutTBUpdate.xhtml | 39 +++
browser/base/content/browser-siteIdentity.js | 2 +-
browser/base/content/browser.js| 4 +
browser/base/jar.mn| 5 +
browser/components/BrowserContentHandler.jsm | 55 +++---
browser/components/BrowserGlue.jsm | 15 +++
browser/components/about/AboutRedirector.cpp | 6 ++
browser/components/about/components.conf | 3 +
browser/components/moz.build | 5 +-
.../locales/en-US/chrome/browser/aboutTBUpdate.dtd | 8 ++
browser/locales/jar.mn | 3 +
toolkit/modules/RemotePageAccessManager.jsm| 5 +
17 files changed, 373 insertions(+), 16 deletions(-)
diff --git a/browser/actors/AboutTBUpdateChild.jsm
b/browser/actors/AboutTBUpdateChild.jsm
new file mode 100644
index ..4670da19b3db
--- /dev/null
+++ b/browser/actors/AboutTBUpdateChild.jsm
@@ -0,0 +1,12 @@
+// Copyright (c) 2020, The Tor Project, Inc.
+// See LICENSE for licensing information.
+//
+// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
+
+var EXPORTED_SYMBOLS = ["AboutTBUpdateChild"];
+
+const { RemotePageChild } = ChromeUtils.import(
+ "resource://gre/actors/RemotePageChild.jsm"
+);
+
+class AboutTBUpdateChild extends RemotePageChild {}
diff --git a/browser/actors/AboutTBUpdateParent.jsm
b/browser/actors/AboutTBUpdateParent.jsm
new file mode 100644
index ..56a10394565a
--- /dev/null
+++ b/browser/actors/AboutTBUpdateParent.jsm
@@ -0,0 +1,120 @@
+// Copyright (c) 2020, The Tor Project, Inc.
+// See LICENSE for licensing information.
+//
+// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
+
+"use strict";
+
+this.EXPORTED_SYMBOLS = ["AboutTBUpdateParent"];
+
+const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
+const { AppConstants } = ChromeUtils.import(
+ "resource://gre/modules/AppConstants.jsm"
+);
+
+const kRequestUpdateMessageName = "FetchUpdateData";
+
+/**
+ * This code provides services to the about:tbupdate page. Whenever
+ * about:tbupdate needs to do something chrome-privileged, it sends a
+ * message that's handled here. It is modeled after Mozilla's about:home
+ * implementation.
+ */
+class AboutTBUpdateParent extends JSWindowActorParent {
+ receiveMessage(aMessage) {
+if (aMessage.name == kRequestUpdateMessageName) {
+ return this.releaseNoteInfo;
+}
+return undefined;
+ }
+
+ get moreInfoURL() {
+try {
+ return Services.prefs.getCharPref("torbrowser.post_update.url");
+} catch (e) {}
+
+// Use the default URL as a fallback.
+return
Services.urlFormatter.formatURLPref("startup.homepage_override_url");
+ }
+
+ // Read the text from the beginning of the changelog file that is located
+ // at TorBrowser/Docs/ChangeLog.txt and return an object that contains
+ // the following properties:
+ // versione.g., Tor Browser 8.5
+ // releaseDatee.g., March 31 2019
+ // releaseNotes details of changes (lines 2 - end of ChangeLog.txt)
+ // We attempt to parse the first line of ChangeLog.txt to extract the
+ // version and releaseDate. If parsing fails, we return the entire first
+ // line in version and omit releaseDate.
+ //
+ // On Mac OS, when building with --enable-tor-browser-data-outside-app-dir
+ // to support Gatekeeper signing, the ChangeLog.txt file is located in
+ // TorBrowser.app/Contents/Resources/TorBrowser/Docs/.
+ get releaseNoteInfo() {
+let info = { moreInfoURL: this.moreInfoURL };
+
+try {
+ let f;
+ if (AppConstants.TOR_BROWSER_DATA_OUTSIDE_APP_DIR) {
+// "XREExeF".parent is the directory that contains firefox, i.e.,
+// Browser/ or, on Mac OS, TorBrowser.app/Contents/MacOS/.
+f =
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
commit 2ca879dd1d340e5236af3cbc0a951dab08e1056b Author: Mike Perry Date: Fri May 5 03:41:57 2017 -0700 Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing eBay and Amazon don't treat Tor users very well. Accounts often get locked and payments reversed. Also: Bug 16322: Update DuckDuckGo search engine We are replacing the clearnet URL with an onion service one (thanks to a patch by a cypherpunk) and are removing the duplicated DDG search engine. Duplicating DDG happend due to bug 1061736 where Mozilla included DDG itself into Firefox. Interestingly, this caused breaking the DDG search if JavaScript is disabled as the Mozilla engine, which gets loaded earlier, does not use the html version of the search page. Moreover, the Mozilla engine tracked where the users were searching from by adding a respective parameter to the search query. We got rid of that feature as well. Also: This fixes bug 20809: the DuckDuckGo team has changed its server-side code in a way that lets users with JavaScript enabled use the default landing page while those without JavaScript available get redirected directly to the non-JS page. We adapt the search engine URLs accordingly. Also fixes bug 29798 by making sure we only specify the Google search engine we actually ship an .xml file for. Also regression tests. --- .../search/extensions/ddg-onion/favicon.ico| Bin 0 -> 973 bytes .../search/extensions/ddg-onion/manifest.json | 26 ++ .../components/search/extensions/ddg/favicon.ico | Bin 5430 -> 0 bytes .../components/search/extensions/ddg/favicon.png | Bin 0 -> 1150 bytes .../components/search/extensions/ddg/manifest.json | 38 ++--- .../extensions/google/_locales/b-1-d/messages.json | 23 - .../extensions/google/_locales/b-1-e/messages.json | 23 - .../extensions/google/_locales/b-d/messages.json | 23 - .../extensions/google/_locales/b-e/messages.json | 23 - .../extensions/google/_locales/en/messages.json| 24 - .../search/extensions/google/manifest.json | 17 + .../search/extensions/startpage/favicon.png| Bin 0 -> 1150 bytes .../search/extensions/startpage/manifest.json | 26 ++ .../search/extensions/twitter/favicon.ico | Bin 0 -> 1650 bytes .../search/extensions/twitter/manifest.json| 26 ++ .../extensions/wikipedia/_locales/NN/messages.json | 20 --- .../extensions/wikipedia/_locales/NO/messages.json | 20 --- .../extensions/wikipedia/_locales/af/messages.json | 20 --- .../extensions/wikipedia/_locales/an/messages.json | 20 --- .../extensions/wikipedia/_locales/ar/messages.json | 20 --- .../wikipedia/_locales/ast/messages.json | 20 --- .../extensions/wikipedia/_locales/az/messages.json | 20 --- .../wikipedia/_locales/be-tarask/messages.json | 20 --- .../extensions/wikipedia/_locales/be/messages.json | 20 --- .../extensions/wikipedia/_locales/bg/messages.json | 20 --- .../extensions/wikipedia/_locales/bn/messages.json | 20 --- .../extensions/wikipedia/_locales/br/messages.json | 20 --- .../extensions/wikipedia/_locales/bs/messages.json | 20 --- .../extensions/wikipedia/_locales/ca/messages.json | 20 --- .../extensions/wikipedia/_locales/cy/messages.json | 20 --- .../extensions/wikipedia/_locales/cz/messages.json | 20 --- .../extensions/wikipedia/_locales/da/messages.json | 20 --- .../extensions/wikipedia/_locales/de/messages.json | 20 --- .../wikipedia/_locales/dsb/messages.json | 20 --- .../extensions/wikipedia/_locales/el/messages.json | 20 --- .../extensions/wikipedia/_locales/en/messages.json | 20 --- .../extensions/wikipedia/_locales/eo/messages.json | 20 --- .../extensions/wikipedia/_locales/es/messages.json | 20 --- .../extensions/wikipedia/_locales/et/messages.json | 20 --- .../extensions/wikipedia/_locales/eu/messages.json | 20 --- .../extensions/wikipedia/_locales/fa/messages.json | 20 --- .../extensions/wikipedia/_locales/fi/messages.json | 20 --- .../extensions/wikipedia/_locales/fr/messages.json | 20 --- .../wikipedia/_locales/fy-NL/messages.json | 20 --- .../wikipedia/_locales/ga-IE/messages.json | 20 --- .../extensions/wikipedia/_locales/gd/messages.json | 20 --- .../extensions/wikipedia/_locales/gl/messages.json | 20 --- .../extensions/wikipedia/_locales/gn/messages.json | 20 --- .../extensions/wikipedia/_locales/gu/messages.json | 20 --- .../extensions/wikipedia/_locales/he/messages.json |
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 26345: Hide tracking protection UI
commit ce59945d779b3c657369e2b344c401eb2bca612a
Author: Alex Catarineu
Date: Tue Sep 10 16:29:31 2019 +0200
Bug 26345: Hide tracking protection UI
---
browser/base/content/browser-siteIdentity.js | 4 ++--
browser/base/content/browser.xhtml| 4 ++--
browser/components/about/AboutRedirector.cpp | 4
browser/components/about/components.conf | 1 -
browser/components/moz.build | 1 -
browser/themes/shared/preferences/privacy.css | 4
6 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/browser/base/content/browser-siteIdentity.js
b/browser/base/content/browser-siteIdentity.js
index 370e2af9477b..4c11ea8d18f0 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -911,10 +911,10 @@ var gIdentityHandler = {
gPermissionPanel.refreshPermissionIcons();
}
-// Hide the shield icon if it is a chrome page.
+// Bug 26345: Hide tracking protection UI.
gProtectionsHandler._trackingProtectionIconContainer.classList.toggle(
"chromeUI",
- this._isSecureInternalUI
+ true
);
},
diff --git a/browser/base/content/browser.xhtml
b/browser/base/content/browser.xhtml
index f8381a5dad9e..c859d65af413 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -782,7 +782,7 @@
oncommand="gSync.toggleAccountPanel(this, event)"/>
-
+
@@ -793,7 +793,7 @@
-
+
description {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 21724: Make Firefox and Tor Browser distinct macOS apps
commit df4d050318f97942af8df4c980958a77f136367d Author: teor Date: Mon Mar 13 23:06:23 2017 +1100 Bug 21724: Make Firefox and Tor Browser distinct macOS apps When macOS opens a document or selects a default browser, it sometimes uses the CFBundleSignature. Changing from the Firefox MOZB signature to a different signature TORB allows macOS to distinguish between Firefox and Tor Browser. --- browser/app/Makefile.in | 2 +- browser/app/macbuild/Contents/Info.plist.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 54d6b43fe126..8dd3a9a65661 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -102,5 +102,5 @@ ifdef MOZ_UPDATER mv -f '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' '$(dist_dest)/Contents/Library/LaunchServices' ln -s ../../../../Library/LaunchServices/org.mozilla.updater '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' endif - printf APPLMOZB > '$(dist_dest)/Contents/PkgInfo' + printf APPLTORB > '$(dist_dest)/Contents/PkgInfo' endif diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in index 0de109988e5e..07d914158563 100644 --- a/browser/app/macbuild/Contents/Info.plist.in +++ b/browser/app/macbuild/Contents/Info.plist.in @@ -179,7 +179,7 @@ CFBundleShortVersionString @APP_VERSION@ CFBundleSignature - MOZB + TORB CFBundleURLTypes ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 16285: Exclude ClearKey system for now
commit a50c91da4ddccf952660239e7832797cb68f5f96 Author: Georg Koppen Date: Mon May 22 12:44:40 2017 + Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. --- browser/installer/package-manifest.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 667da5835b9b..b752f985c4c2 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -473,8 +473,8 @@ bin/libfreebl_64int_3.so #endif ; media -@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@ -@RESPATH@/gmp-clearkey/0.1/manifest.json +;@RESPATH@/gmp-clearkey/0.1/@DLL_PREFIX@clearkey@DLL_SUFFIX@ +;@RESPATH@/gmp-clearkey/0.1/manifest.json #ifdef MOZ_DMD ; DMD ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 4234: Use the Firefox Update Process for Tor Browser.
commit d8d52e0941849c7f3aa4989051594a167d83c96e Author: Kathy Brade Date: Fri Jan 13 11:40:24 2017 -0500 Bug 4234: Use the Firefox Update Process for Tor Browser. The following files are never updated: TorBrowser/Data/Browser/profiles.ini TorBrowser/Data/Browser/profile.default/bookmarks.html TorBrowser/Data/Tor/torrc Mac OS: Store update metadata under TorBrowser/UpdateInfo. Removed the %OS_VERSION% component from the update URL (13047) and added support for minSupportedOSVersion, an attribute of the element that may be used to trigger Firefox's "unsupported platform" behavior. Hide the "What's new" links (set app.releaseNotesURL value to about:blank). Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix Bug 26049: reduce the delay before the update prompt is displayed. Instead of Firefox's 2 days, we use 1 hour (after which time the update doorhanger will be displayed). Also fix bug 27221: purge the startup cache if the Tor Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Tor Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Tor Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. --- browser/app/Makefile.in| 2 + browser/app/profile/000-tor-browser.js | 16 +- browser/app/profile/firefox.js | 10 +- browser/base/content/aboutDialog-appUpdater.js | 2 +- browser/base/content/aboutDialog.js| 12 +- browser/components/BrowserContentHandler.jsm | 39 ++- .../customizableui/content/panelUI.inc.xhtml | 5 +- browser/confvars.sh| 35 +-- browser/installer/package-manifest.in | 2 + build/application.ini.in | 2 +- build/moz.configure/init.configure | 3 +- config/createprecomplete.py| 19 +- .../client/aboutdebugging/src/actions/runtimes.js | 5 + toolkit/modules/UpdateUtils.jsm| 22 +- toolkit/mozapps/extensions/AddonManager.jsm| 24 ++ toolkit/mozapps/extensions/test/browser/head.js| 1 + .../extensions/test/xpcshell/head_addons.js| 1 + toolkit/mozapps/update/UpdateService.jsm | 125 +++- toolkit/mozapps/update/UpdateServiceStub.jsm | 4 + toolkit/mozapps/update/common/updatehelper.cpp | 8 + toolkit/mozapps/update/moz.build | 5 +- toolkit/mozapps/update/updater/launchchild_osx.mm | 2 + toolkit/mozapps/update/updater/moz.build | 2 +- toolkit/mozapps/update/updater/updater.cpp | 339 ++--- toolkit/xre/MacLaunchHelper.h | 2 + toolkit/xre/MacLaunchHelper.mm | 2 + toolkit/xre/nsAppRunner.cpp| 22 +- toolkit/xre/nsUpdateDriver.cpp | 109 ++- toolkit/xre/nsXREDirProvider.cpp | 42 ++- tools/update-packaging/common.sh | 64 ++-- tools/update-packaging/make_full_update.sh | 25 ++ tools/update-packaging/make_incremental_update.sh | 71 - 32 files changed, 877 insertions(+), 145 deletions(-) diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 8dd3a9a65661..3a5550c96c15 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -97,10 +97,12 @@ tools repackage::
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 13379: Sign our MAR files.
commit 827524699f583b7e56ffcfe175a3208125b49ace
Author: Kathy Brade
Date: Wed Dec 17 16:37:11 2014 -0500
Bug 13379: Sign our MAR files.
Configure with --enable-verify-mar (when updating, require a valid
signature on the MAR file before it is applied).
Use the Tor Browser version instead of the Firefox version inside the
MAR file info block (necessary to prevent downgrade attacks).
Use NSS on all platforms for checking MAR signatures (instead of using
OS-native APIs, which Mozilla does on Mac OS and Windows). So that the
NSS and NSPR libraries the updater depends on can be found at runtime,
we add the firefox directory to the shared library search path on macOS.
On Linux, rpath is used by Mozilla to solve that problem, but that
approach won't work on macOS because the updater executable is copied
during the update process to a location that is under TorBrowser-Data,
and the location of TorBrowser-Data varies.
Also includes the fix for bug 18900.
---
.mozconfig | 1 +
.mozconfig-asan| 1 +
.mozconfig-mac | 1 +
.mozconfig-mingw | 1 +
modules/libmar/tool/mar.c | 6 +--
modules/libmar/tool/moz.build | 12 --
modules/libmar/verify/moz.build| 14 +++---
.../mozapps/update/updater/updater-common.build| 26 +--
toolkit/mozapps/update/updater/updater.cpp | 25 +++
toolkit/xre/moz.build | 3 ++
toolkit/xre/nsUpdateDriver.cpp | 50 ++
11 files changed, 115 insertions(+), 25 deletions(-)
diff --git a/.mozconfig b/.mozconfig
index 18cd1f9b6487..c50c57d410de 100755
--- a/.mozconfig
+++ b/.mozconfig
@@ -37,3 +37,4 @@ ac_add_options MOZ_TELEMETRY_REPORTING=
ac_add_options --disable-tor-launcher
ac_add_options --with-tor-browser-version=dev-build
ac_add_options --disable-tor-browser-update
+ac_add_options --enable-verify-mar
diff --git a/.mozconfig-asan b/.mozconfig-asan
index bad7ea022c9f..e42ff6c86bc5 100644
--- a/.mozconfig-asan
+++ b/.mozconfig-asan
@@ -29,6 +29,7 @@ ac_add_options --enable-official-branding
ac_add_options --enable-default-toolkit=cairo-gtk3
ac_add_options --enable-tor-browser-update
+ac_add_options --enable-verify-mar
ac_add_options --disable-strip
ac_add_options --disable-install-strip
diff --git a/.mozconfig-mac b/.mozconfig-mac
index 26e2b6b92fdb..5b4624ef1f67 100644
--- a/.mozconfig-mac
+++ b/.mozconfig-mac
@@ -43,6 +43,7 @@ ac_add_options --disable-debug
ac_add_options --enable-tor-browser-data-outside-app-dir
ac_add_options --enable-tor-browser-update
+ac_add_options --enable-verify-mar
ac_add_options --disable-crashreporter
ac_add_options --disable-webrtc
diff --git a/.mozconfig-mingw b/.mozconfig-mingw
index 3ec6ff18a3e9..ce6ace1dad67 100644
--- a/.mozconfig-mingw
+++ b/.mozconfig-mingw
@@ -15,6 +15,7 @@ ac_add_options --enable-strip
ac_add_options --enable-official-branding
ac_add_options --enable-tor-browser-update
+ac_add_options --enable-verify-mar
ac_add_options --disable-bits-download
# Let's make sure no preference is enabling either Adobe's or Google's CDM.
diff --git a/modules/libmar/tool/mar.c b/modules/libmar/tool/mar.c
index 0bf2cb4bd1d4..ea2b79924914 100644
--- a/modules/libmar/tool/mar.c
+++ b/modules/libmar/tool/mar.c
@@ -65,7 +65,7 @@ static void print_usage() {
"signed_input_archive.mar base_64_encoded_signature_file "
"changed_signed_output.mar\n");
printf("(i) is the index of the certificate to extract\n");
-# if defined(XP_MACOSX) || (defined(XP_WIN) && !defined(MAR_NSS))
+# if (defined(XP_MACOSX) || defined(XP_WIN)) && !defined(MAR_NSS)
printf("Verify a MAR file:\n");
printf(" mar [-C workingDir] -D DERFilePath -v signed_archive.mar\n");
printf(
@@ -149,7 +149,7 @@ int main(int argc, char** argv) {
memset((void*)certBuffers, 0, sizeof(certBuffers));
#endif
#if !defined(NO_SIGN_VERIFY) && \
-((!defined(MAR_NSS) && defined(XP_WIN)) || defined(XP_MACOSX))
+(!defined(MAR_NSS) && (defined(XP_WIN) || defined(XP_MACOSX)))
memset(DERFilePaths, 0, sizeof(DERFilePaths));
memset(fileSizes, 0, sizeof(fileSizes));
#endif
@@ -181,7 +181,7 @@ int main(int argc, char** argv) {
argc -= 2;
}
#if !defined(NO_SIGN_VERIFY)
-# if (!defined(MAR_NSS) && defined(XP_WIN)) || defined(XP_MACOSX)
+# if (!defined(MAR_NSS) && (defined(XP_WIN) || defined(XP_MACOSX)))
/* -D DERFilePath, also matches -D[index] DERFilePath
We allow an index for verifying to be symmetric
with the import and export command line arguments. */
diff --git a/modules/libmar/tool/moz.build b/modules/libmar/tool/moz.build
index a6d26c66a668..d6fa1677ddf1 100644
--- a/modules/libmar/tool/moz.build
+++
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 11641: change TBB directory structure to be more like Firefox's
commit 8b364294838efdcd170e8b065dc9836e0b61abea
Author: Kathy Brade
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 3ea656c495bb..e96ad9241f98 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -1836,8 +1836,10 @@ static void DumpHelp() {
" --migrationStart with migration wizard.\n"
" --ProfileManager Start with ProfileManager.\n"
#ifdef MOZ_HAS_REMOTE
- " --no-remoteDo 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
@@ -4081,16 +4083,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");
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 19121: reinstate the update.xml hash check
commit 0c9b4f25016bbf7f1ecd293b6baceed90fefb8e1
Author: Kathy Brade
Date: Mon Apr 23 15:22:57 2018 -0400
Bug 19121: reinstate the update.xml hash check
Revert most changes from Mozilla Bug 1373267 "Remove hashFunction and
hashValue attributes from nsIUpdatePatch and code related to these
attributes." Changes to the tests were not reverted; the tests have
been changed significantly and we do not run automated updater tests
for Tor Browser at this time.
Also partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122.
Revert the nsUpdateService.js changes from Mozilla Bug 862173 "don't
verify mar file hash when using mar signing to verify the mar file
(lessens main thread I/O)."
Changes to the tests were not reverted; the tests have been changed
significantly and we do not run automated updater tests for
Tor Browser at this time.
We kept the addition to the AppConstants API in case other JS code
references it in the future.
---
toolkit/modules/AppConstants.jsm| 7
toolkit/mozapps/update/UpdateService.jsm| 63 -
toolkit/mozapps/update/UpdateTelemetry.jsm | 1 +
toolkit/mozapps/update/nsIUpdateService.idl | 11 +
4 files changed, 81 insertions(+), 1 deletion(-)
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm
index 41ed947d0526..16c3ea56395b 100644
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -212,6 +212,13 @@ this.AppConstants = Object.freeze({
false,
#endif
+ MOZ_VERIFY_MAR_SIGNATURE:
+#ifdef MOZ_VERIFY_MAR_SIGNATURE
+ true,
+#else
+ false,
+#endif
+
MOZ_MAINTENANCE_SERVICE:
#ifdef MOZ_MAINTENANCE_SERVICE
true,
diff --git a/toolkit/mozapps/update/UpdateService.jsm
b/toolkit/mozapps/update/UpdateService.jsm
index ad2ee1e00bf2..b200e18c5e8f 100644
--- a/toolkit/mozapps/update/UpdateService.jsm
+++ b/toolkit/mozapps/update/UpdateService.jsm
@@ -918,6 +918,20 @@ function LOG(string) {
}
}
+/**
+ * Convert a string containing binary values to hex.
+ */
+function binaryToHex(input) {
+ var result = "";
+ for (var i = 0; i < input.length; ++i) {
+var hex = input.charCodeAt(i).toString(16);
+if (hex.length == 1)
+ hex = "0" + hex;
+result += hex;
+ }
+ return result;
+}
+
/**
* Gets the specified directory at the specified hierarchy under the
* update root directory and creates it if it doesn't exist.
@@ -1918,6 +1932,8 @@ function UpdatePatch(patch) {
}
break;
case "finalURL":
+ case "hashFunction":
+ case "hashValue":
case "state":
case "type":
case "URL":
@@ -1937,6 +1953,8 @@ UpdatePatch.prototype = {
// over writing nsIUpdatePatch attributes.
_attrNames: [
"errorCode",
+"hashFunction",
+"hashValue",
"finalURL",
"selected",
"size",
@@ -1950,6 +1968,8 @@ UpdatePatch.prototype = {
*/
serialize: function UpdatePatch_serialize(updates) {
var patch = updates.createElementNS(URI_UPDATE_NS, "patch");
+patch.setAttribute("hashFunction", this.hashFunction);
+patch.setAttribute("hashValue", this.hashValue);
patch.setAttribute("size", this.size);
patch.setAttribute("type", this.type);
patch.setAttribute("URL", this.URL);
@@ -4973,7 +4993,42 @@ Downloader.prototype = {
}
LOG("Downloader:_verifyDownload downloaded size == expected size.");
-return true;
+let fileStream = Cc["@mozilla.org/network/file-input-stream;1"].
+ createInstance(Ci.nsIFileInputStream);
+fileStream.init(destination, FileUtils.MODE_RDONLY, FileUtils.PERMS_FILE,
0);
+
+let digest;
+try {
+ let hash = Cc["@mozilla.org/security/hash;1"].
+ createInstance(Ci.nsICryptoHash);
+ var hashFunction =
Ci.nsICryptoHash[this._patch.hashFunction.toUpperCase()];
+ if (hashFunction == undefined) {
+throw Cr.NS_ERROR_UNEXPECTED;
+ }
+ hash.init(hashFunction);
+ hash.updateFromStream(fileStream, -1);
+ // NOTE: For now, we assume that the format of _patch.hashValue is hex
+ // encoded binary (such as what is typically output by programs like
+ // sha1sum). In the future, this may change to base64 depending on how
+ // we choose to compute these hashes.
+ digest = binaryToHex(hash.finish(false));
+} catch (e) {
+ LOG("Downloader:_verifyDownload - failed to compute hash of the " +
+ "downloaded update archive");
+ digest = "";
+}
+
+fileStream.close();
+
+if (digest == this._patch.hashValue.toLowerCase()) {
+ LOG("Downloader:_verifyDownload hashes match.");
+ return true;
+}
+
+LOG("Downloader:_verifyDownload hashes do not match. ");
+AUSTLMY.pingDownloadCode(this.isCompleteUpdate,
+ AUSTLMY.DWNLD_ERR_VERIFY_NO_HASH_MATCH);
+return false;
},
/**
@@ -5559,6
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 19273: Avoid JavaScript patching of the external app helper dialog.
commit 66cf1e2bbc13d3942e0eb421e9ba314bd2343fe5
Author: Kathy Brade
Date: Tue Jun 28 15:13:05 2016 -0400
Bug 19273: Avoid JavaScript patching of the external app helper dialog.
When handling an external URI or downloading a file, invoke Torbutton's
external app blocker component (which will present a download warning
dialog unless the user has checked the "Automatically download files
from now on" box).
For e10s compatibility, avoid using a modal dialog and instead use
a callback interface (nsIHelperAppWarningLauncher) to allow Torbutton
to indicate the user's desire to cancel or continue each request.
Other bugs fixed:
Bug 21766: Crash with e10s enabled while trying to download a file
Bug 21886: Download is stalled in non-e10s mode
Bug 22471: Downloading files via the PDF viewer download button is broken
Bug 22472: Fix FTP downloads when external helper app dialog is shown
Bug 22610: Avoid crashes when canceling external helper app downloads
Bug 22618: Downloading pdf file via file:/// is stalling
---
.../exthandler/nsExternalHelperAppService.cpp | 177 ++---
uriloader/exthandler/nsExternalHelperAppService.h | 3 +
.../exthandler/nsIExternalHelperAppService.idl | 47 ++
3 files changed, 209 insertions(+), 18 deletions(-)
diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp
b/uriloader/exthandler/nsExternalHelperAppService.cpp
index 520bc2c396ee..e1d95acd969d 100644
--- a/uriloader/exthandler/nsExternalHelperAppService.cpp
+++ b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -133,6 +133,9 @@ static const char NEVER_ASK_FOR_SAVE_TO_DISK_PREF[] =
static const char NEVER_ASK_FOR_OPEN_FILE_PREF[] =
"browser.helperApps.neverAsk.openFile";
+static const char WARNING_DIALOG_CONTRACT_ID[] =
+"@torproject.org/torbutton-extAppBlocker;1";
+
// Helper functions for Content-Disposition headers
/**
@@ -405,6 +408,22 @@ static nsresult GetDownloadDirectory(nsIFile** _directory,
return NS_OK;
}
+static already_AddRefed GetDialogParentAux(
+BrowsingContext* aBrowsingContext, nsIInterfaceRequestor* aWindowContext) {
+ nsCOMPtr dialogParent = aWindowContext;
+
+ if (!dialogParent && aBrowsingContext) {
+dialogParent = do_QueryInterface(aBrowsingContext->GetDOMWindow());
+ }
+ if (!dialogParent && aBrowsingContext && XRE_IsParentProcess()) {
+RefPtr element = aBrowsingContext->Top()->GetEmbedderElement();
+if (element) {
+ dialogParent = do_QueryInterface(element->OwnerDoc()->GetWindow());
+}
+ }
+ return dialogParent.forget();
+}
+
/**
* Structure for storing extension->type mappings.
* @see defaultMimeEntries
@@ -608,6 +627,96 @@ static const char* descriptionOverwriteExtensions[] = {
"avif", "pdf", "svg", "webp", "xml",
};
+//
+// begin nsExternalLoadURIHandler class definition and implementation
+//
+class nsExternalLoadURIHandler final : public nsIHelperAppWarningLauncher {
+ public:
+ NS_DECL_THREADSAFE_ISUPPORTS
+ NS_DECL_NSIHELPERAPPWARNINGLAUNCHER
+
+ nsExternalLoadURIHandler(nsIHandlerInfo* aHandlerInfo, nsIURI* aURI,
+ nsIPrincipal* aTriggeringPrincipal,
+ BrowsingContext* aBrowsingContext,
+ bool aTriggeredExternally);
+
+ protected:
+ ~nsExternalLoadURIHandler();
+
+ nsCOMPtr mHandlerInfo;
+ nsCOMPtr mURI;
+ nsCOMPtr mTriggeringPrincipal;
+ RefPtr mBrowsingContext;
+ bool mTriggeredExternally;
+ nsCOMPtr mWarningDialog;
+};
+
+NS_IMPL_ADDREF(nsExternalLoadURIHandler)
+NS_IMPL_RELEASE(nsExternalLoadURIHandler)
+
+NS_INTERFACE_MAP_BEGIN(nsExternalLoadURIHandler)
+ NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIHelperAppWarningLauncher)
+ NS_INTERFACE_MAP_ENTRY(nsIHelperAppWarningLauncher)
+NS_INTERFACE_MAP_END
+
+nsExternalLoadURIHandler::nsExternalLoadURIHandler(
+nsIHandlerInfo* aHandlerInfo, nsIURI* aURI,
+nsIPrincipal* aTriggeringPrincipal, BrowsingContext* aBrowsingContext,
+bool aTriggeredExternally)
+: mHandlerInfo(aHandlerInfo),
+ mURI(aURI),
+ mTriggeringPrincipal(aTriggeringPrincipal),
+ mBrowsingContext(aBrowsingContext),
+ mTriggeredExternally(aTriggeredExternally)
+
+{
+ nsresult rv = NS_OK;
+ mWarningDialog = do_CreateInstance(WARNING_DIALOG_CONTRACT_ID, );
+ if (NS_SUCCEEDED(rv) && mWarningDialog) {
+// This will create a reference cycle (the dialog holds a reference to us
+// as nsIHelperAppWarningLauncher), which will be broken in ContinueRequest
+// or CancelRequest.
+nsCOMPtr dialogParent =
+GetDialogParentAux(aBrowsingContext, nullptr);
+rv = mWarningDialog->MaybeShow(this, dialogParent);
+ }
+
+ if (NS_FAILED(rv)) {
+// If for some
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp
commit 070c18e1a13b210de43fe5298b2d4fc7d4cdbf96
Author: Kathy Brade
Date: Thu Apr 21 10:40:26 2016 -0400
Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp
Instead of using the local computer's IP address within
symlink-based profile lock signatures, always use 127.0.0.1.
---
toolkit/profile/nsProfileLock.cpp | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/toolkit/profile/nsProfileLock.cpp
b/toolkit/profile/nsProfileLock.cpp
index 8cbb67deb5d8..dee8b4c75b46 100644
--- a/toolkit/profile/nsProfileLock.cpp
+++ b/toolkit/profile/nsProfileLock.cpp
@@ -304,18 +304,17 @@ nsresult nsProfileLock::LockWithSymlink(nsIFile*
aLockFile,
if (!mReplacedLockTime)
aLockFile->GetLastModifiedTimeOfLink();
+ // For Tor Browser, avoid a DNS lookup here so the Tor network is not
+ // bypassed. Instead, always use 127.0.0.1 for the IP address portion
+ // of the lock signature, which may cause the browser to refuse to
+ // start in the rare event that all of the following conditions are met:
+ // 1. The browser profile is on a network file system.
+ // 2. The file system does not support fcntl() locking.
+ // 3. Tor Browser is run from two different computers at the same time.
+
struct in_addr inaddr;
inaddr.s_addr = htonl(INADDR_LOOPBACK);
- char hostname[256];
- PRStatus status = PR_GetSystemInfo(PR_SI_HOSTNAME, hostname, sizeof
hostname);
- if (status == PR_SUCCESS) {
-char netdbbuf[PR_NETDB_BUF_SIZE];
-PRHostEnt hostent;
-status = PR_GetHostByName(hostname, netdbbuf, sizeof netdbbuf, );
-if (status == PR_SUCCESS) memcpy(, hostent.h_addr, sizeof inaddr);
- }
-
mozilla::SmprintfPointer signature =
mozilla::Smprintf("%s:%s%lu", inet_ntoa(inaddr),
aHaveFcntlLock ? "+" : "", (unsigned long)getpid());
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 18821: Disable libmdns for Android and Desktop
commit 524adba2322122497e1d013bd4db22b13b08813f
Author: Georg Koppen
Date: Wed Apr 20 14:34:50 2016 +
Bug 18821: Disable libmdns for Android and Desktop
There should be no need to remove the OS X support introduced in
https://bugzilla.mozilla.org/show_bug.cgi?id=1225726 as enabling this
is governed by a preference (which is actually set to `false`). However,
we remove it at build time as well (defense in depth).
This is basically a backout of the relevant passages of
https://hg.mozilla.org/mozilla-central/rev/6bfb430de85d,
https://hg.mozilla.org/mozilla-central/rev/609b337bf7ab and
https://hg.mozilla.org/mozilla-central/rev/8e092ec5fbbd.
Fixed bug 21861 (Disable additional mDNS code to avoid proxy bypasses)
as well.
Mozilla removed the Presentation API piece of this patch in Bug 1697680.
---
netwerk/dns/mdns/libmdns/components.conf | 15 ---
netwerk/dns/mdns/libmdns/moz.build | 28
2 files changed, 43 deletions(-)
diff --git a/netwerk/dns/mdns/libmdns/components.conf
b/netwerk/dns/mdns/libmdns/components.conf
index 6e64140c820e..1b50dbf673a4 100644
--- a/netwerk/dns/mdns/libmdns/components.conf
+++ b/netwerk/dns/mdns/libmdns/components.conf
@@ -5,20 +5,5 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
Classes = [
-{
-'cid': '{14a50f2b-7ff6-48a5-88e3-615fd111f5d3}',
-'contract_ids':
['@mozilla.org/toolkit/components/mdnsresponder/dns-info;1'],
-'type': 'mozilla::net::nsDNSServiceInfo',
-'headers': ['/netwerk/dns/mdns/libmdns/nsDNSServiceInfo.h'],
-},
]
-if buildconfig.substs['MOZ_WIDGET_TOOLKIT'] != 'cocoa':
-Classes += [
-{
-'cid': '{f9346d98-f27a-4e89-b744-493843416480}',
-'contract_ids':
['@mozilla.org/toolkit/components/mdnsresponder/dns-sd;1'],
-'jsm': 'resource://gre/modules/DNSServiceDiscovery.jsm',
-'constructor': 'nsDNSServiceDiscovery',
-},
-]
diff --git a/netwerk/dns/mdns/libmdns/moz.build
b/netwerk/dns/mdns/libmdns/moz.build
index f9c025fa823e..e6e70a6d803c 100644
--- a/netwerk/dns/mdns/libmdns/moz.build
+++ b/netwerk/dns/mdns/libmdns/moz.build
@@ -4,34 +4,6 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
-UNIFIED_SOURCES += [
-"MDNSResponderOperator.cpp",
-"MDNSResponderReply.cpp",
-"nsDNSServiceDiscovery.cpp",
-]
-
-LOCAL_INCLUDES += [
-"/netwerk/base",
-]
-
-else:
-EXTRA_JS_MODULES += [
-"DNSServiceDiscovery.jsm",
-"fallback/DataReader.jsm",
-"fallback/DataWriter.jsm",
-"fallback/DNSPacket.jsm",
-"fallback/DNSRecord.jsm",
-"fallback/DNSResourceRecord.jsm",
-"fallback/DNSTypes.jsm",
-"fallback/MulticastDNS.jsm",
-]
-
-if CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
-EXTRA_JS_MODULES += [
-"MulticastDNSAndroid.jsm",
-]
-
UNIFIED_SOURCES += [
"nsDNSServiceInfo.cpp",
]
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 13252: Do not store data in the app bundle
commit 831ed0a8ebc19e87e4ef6c0ad70fa29e9cb088a6
Author: Kathy Brade
Date: Fri Mar 18 14:20:02 2016 -0400
Bug 13252: Do not store data in the app bundle
When --enable-tor-browser-data-outside-app-dir is enabled,
all user data is stored in a directory named
TorBrowser-Data which is located next to the application directory.
Display an informative error message if the TorBrowser-Data
directory cannot be created due to an "access denied" or a
"read only volume" error.
On Mac OS, add support for the --invisible command line option which
is used by the meek-http-helper to avoid showing an icon for the
helper browser on the dock.
---
toolkit/xre/nsAppRunner.cpp| 73 +++---
toolkit/xre/nsXREDirProvider.cpp | 43 +--
toolkit/xre/nsXREDirProvider.h | 6 ++
xpcom/io/TorFileUtils.cpp | 133 +
xpcom/io/TorFileUtils.h| 32
xpcom/io/moz.build | 5 ++
xpcom/io/nsAppFileLocationProvider.cpp | 53 ++---
7 files changed, 278 insertions(+), 67 deletions(-)
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 414c33f18147..3ea656c495bb 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2452,6 +2452,8 @@ static nsresult ProfileMissingDialog(nsINativeAppSupport*
aNative) {
}
}
+// If aUnlocker is NULL, it is also OK for the following arguments to be NULL:
+// aProfileDir, aProfileLocalDir, aResult.
static ReturnAbortOnError ProfileErrorDialog(nsIFile* aProfileDir,
nsIFile* aProfileLocalDir,
ProfileStatus aStatus,
@@ -2460,17 +2462,19 @@ static ReturnAbortOnError ProfileErrorDialog(nsIFile*
aProfileDir,
nsIProfileLock** aResult) {
nsresult rv;
- bool exists;
- aProfileDir->Exists();
- if (!exists) {
-return ProfileMissingDialog(aNative);
+ if (aProfileDir) {
+bool exists;
+aProfileDir->Exists();
+if (!exists) {
+ return ProfileMissingDialog(aNative);
+}
}
ScopedXPCOMStartup xpcom;
rv = xpcom.Initialize();
NS_ENSURE_SUCCESS(rv, rv);
- mozilla::Telemetry::WriteFailedProfileLock(aProfileDir);
+ if (aProfileDir) mozilla::Telemetry::WriteFailedProfileLock(aProfileDir);
rv = xpcom.SetWindowCreator(aNative);
NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE);
@@ -2670,6 +2674,23 @@ static ReturnAbortOnError ShowProfileManager(
return LaunchChild(false, true);
}
+#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
+static ProfileStatus CheckTorBrowserDataWriteAccess(nsIFile* aAppDir) {
+ // Check whether we can write to the directory that will contain
+ // TorBrowser-Data.
+ nsCOMPtr tbDataDir;
+ RefPtr dirProvider = nsXREDirProvider::GetSingleton();
+ if (!dirProvider) return PROFILE_STATUS_OTHER_ERROR;
+ nsresult rv =
+ dirProvider->GetTorBrowserUserDataDir(getter_AddRefs(tbDataDir));
+ NS_ENSURE_SUCCESS(rv, PROFILE_STATUS_OTHER_ERROR);
+ nsCOMPtr tbDataDirParent;
+ rv = tbDataDir->GetParent(getter_AddRefs(tbDataDirParent));
+ NS_ENSURE_SUCCESS(rv, PROFILE_STATUS_OTHER_ERROR);
+ return nsToolkitProfileService::CheckProfileWriteAccess(tbDataDirParent);
+}
+#endif
+
static bool gDoMigration = false;
static bool gDoProfileReset = false;
static nsCOMPtr gResetOldProfile;
@@ -3712,6 +3733,14 @@ int XREMain::XRE_mainInit(bool* aExitFlag) {
if (PR_GetEnv("XRE_MAIN_BREAK")) NS_BREAK();
#endif
+#if defined(XP_MACOSX) && defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
+ bool hideDockIcon = (CheckArg("invisible") == ARG_FOUND);
+ if (hideDockIcon) {
+ProcessSerialNumber psn = {0, kCurrentProcess};
+TransformProcessType(, kProcessTransformToBackgroundApplication);
+ }
+#endif
+
IncreaseDescriptorLimits();
#ifdef USE_GLX_TEST
@@ -4643,7 +4672,34 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
return 0;
}
+#if (defined(MOZ_UPDATER) && !defined(MOZ_WIDGET_ANDROID)) || \
+defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
+ nsCOMPtr exeFile, exeDir;
+ bool persistent;
+ rv = mDirProvider.GetFile(XRE_EXECUTABLE_FILE, ,
+getter_AddRefs(exeFile));
+ NS_ENSURE_SUCCESS(rv, 1);
+ rv = exeFile->GetParent(getter_AddRefs(exeDir));
+ NS_ENSURE_SUCCESS(rv, 1);
+#endif
+
rv = NS_NewToolkitProfileService(getter_AddRefs(mProfileSvc));
+#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
+ if (NS_FAILED(rv)) {
+// NS_NewToolkitProfileService() returns a generic NS_ERROR_FAILURE error
+// if creation of the TorBrowser-Data directory fails due to access denied
+// or because of a read-only disk volume. Do an extra check here to detect
+// these errors so we can display an informative error message.
+ProfileStatus status = CheckTorBrowserDataWriteAccess(exeDir);
+if ((PROFILE_STATUS_ACCESS_DENIED == status) ||
+
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 16620: Clear window.name when no referrer sent
commit b7f4e2cffb49722b7fdbbc1f059fe719302cb72d
Author: Kathy Brade
Date: Fri Oct 30 14:28:13 2015 -0400
Bug 16620: Clear window.name when no referrer sent
Convert JS implementation (within Torbutton) to a C++ browser patch.
---
docshell/base/nsDocShell.cpp | 60 +++
docshell/test/mochitest/mochitest.ini | 5 +
docshell/test/mochitest/test_tor_bug16620.html | 211 +
docshell/test/mochitest/tor_bug16620.html | 51 ++
docshell/test/mochitest/tor_bug16620_form.html | 51 ++
modules/libpref/init/StaticPrefList.yaml | 2 +-
6 files changed, 379 insertions(+), 1 deletion(-)
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index dffed2bfcca2..cafe98a96c0d 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -7949,11 +7949,71 @@ nsresult nsDocShell::CreateContentViewer(const
nsACString& aContentType,
aOpenedChannel->GetURI(getter_AddRefs(mLoadingURI));
}
FirePageHideNotification(!mSavingOldViewer);
+
if (mIsBeingDestroyed) {
// Force to stop the newly created orphaned viewer.
viewer->Stop();
return NS_ERROR_DOCSHELL_DYING;
}
+
+ // Tor bug 16620: Clear window.name of top-level documents if
+ // there is no referrer. We make an exception for new windows,
+ // e.g., window.open(url, "MyName").
+ bool isNewWindowTarget = false;
+ nsCOMPtr props(do_QueryInterface(aRequest, ));
+ if (props) {
+props->GetPropertyAsBool(u"docshell.newWindowTarget"_ns,
+ );
+ }
+
+ if (!isNewWindowTarget) {
+nsCOMPtr httpChannel(do_QueryInterface(aOpenedChannel));
+nsCOMPtr httpReferrer;
+if (httpChannel) {
+ nsCOMPtr referrerInfo;
+ rv = httpChannel->GetReferrerInfo(getter_AddRefs(referrerInfo));
+ NS_ENSURE_SUCCESS(rv, rv);
+ if (referrerInfo) {
+// We want GetComputedReferrer() instead of GetOriginalReferrer(),
since
+// the former takes into consideration referrer policy, protocol
+// whitelisting...
+httpReferrer = referrerInfo->GetComputedReferrer();
+ }
+}
+
+bool isTopFrame = mBrowsingContext->IsTop();
+
+#ifdef DEBUG_WINDOW_NAME
+printf("DOCSHELL %p CreateContentViewer - possibly clearing
window.name:\n",
+ this);
+printf(" current window.name: \"%s\"\n",
+ NS_ConvertUTF16toUTF8(mName).get());
+
+nsAutoCString curSpec, loadingSpec;
+if (this->mCurrentURI) mCurrentURI->GetSpec(curSpec);
+if (mLoadingURI) mLoadingURI->GetSpec(loadingSpec);
+printf(" current URI: %s\n", curSpec.get());
+printf(" loading URI: %s\n", loadingSpec.get());
+printf(" is top document: %s\n", isTopFrame ? "Yes" : "No");
+
+if (!httpReferrer) {
+ printf(" referrer: None\n");
+} else {
+ nsAutoCString refSpec;
+ httpReferrer->GetSpec(refSpec);
+ printf(" referrer: %s\n", refSpec.get());
+}
+#endif
+
+bool clearName = isTopFrame && !httpReferrer;
+if (clearName) SetName(u""_ns);
+
+#ifdef DEBUG_WINDOW_NAME
+printf(" action taken: %s window.name\n",
+ clearName ? "Cleared" : "Preserved");
+#endif
+ }
+
mLoadingURI = nullptr;
// Set mFiredUnloadEvent = false so that the unload handler for the
diff --git a/docshell/test/mochitest/mochitest.ini
b/docshell/test/mochitest/mochitest.ini
index 546138a37e3c..f603d191ca09 100644
--- a/docshell/test/mochitest/mochitest.ini
+++ b/docshell/test/mochitest/mochitest.ini
@@ -53,6 +53,10 @@ support-files =
start_historyframe.html
url1_historyframe.html
url2_historyframe.html
+ tor_bug16620.html
+ tor_bug16620_form.html
+prefs =
+ gfx.font_rendering.fallback.async=false
[test_anchor_scroll_after_document_open.html]
[test_bfcache_plus_hash.html]
@@ -122,6 +126,7 @@ support-files =
[test_framedhistoryframes.html]
support-files = file_framedhistoryframes.html
[test_pushState_after_document_open.html]
+[test_tor_bug16620.html]
[test_navigate_after_pagehide.html]
[test_redirect_history.html]
support-files =
diff --git a/docshell/test/mochitest/test_tor_bug16620.html
b/docshell/test/mochitest/test_tor_bug16620.html
new file mode 100644
index ..46fff5a04711
--- /dev/null
+++ b/docshell/test/mochitest/test_tor_bug16620.html
@@ -0,0 +1,211 @@
+
+
+
+
+
+ Test for Tor Bug 16620 - Clear window.name when no referrer
sent
+
+
+
+
+https://trac.torproject.org/projects/tor/ticket/16620;>Tor Bug 16620
+
+// ## Test constants
+const kTestPath = "/tests/docshell/test/mochitest/";
+const kLinkFile = "tor_bug16620.html";
+const kFormFile = "tor_bug16620_form.html";
+const kBaseURL1 = "http://example.com";;
+const kBaseURL1_https = "https://example.com";;
+const kBaseURL2 = "http://example.net";;
+const
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 14631: Improve profile access error messages.
commit 74c141bdd21b4c050a0a2fede69dc7c04fa9dd2d
Author: Kathy Brade
Date: Tue Feb 24 13:50:23 2015 -0500
Bug 14631: Improve profile access error messages.
Instead of always reporting that the profile is locked, display specific
messages for "access denied" and "read-only file system".
To allow for localization, get profile-related error strings from Torbutton.
Use app display name ("Tor Browser") in profile-related error alerts.
---
.../mozapps/profile/profileSelection.properties| 5 +
toolkit/profile/nsToolkitProfileService.cpp| 57 +++-
toolkit/profile/nsToolkitProfileService.h | 13 +-
toolkit/xre/nsAppRunner.cpp| 157 ++---
4 files changed, 208 insertions(+), 24 deletions(-)
diff --git
a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties
b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties
index d326083202b2..aa38bda24347 100644
--- a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties
@@ -12,6 +12,11 @@ restartMessageUnlocker=%S is already running, but is not
responding. The old %S
restartMessageNoUnlockerMac=A copy of %S is already open. Only one copy of %S
can be open at a time.
restartMessageUnlockerMac=A copy of %S is already open. The running copy of %S
will quit in order to open this one.
+# LOCALIZATION NOTE (profileProblemTitle, profileReadOnly, profileReadOnlyMac,
profileAccessDenied): Messages displayed when the browser profile cannot be
accessed or written to. %S is the application name.
+profileProblemTitle=%S Profile Problem
+profileReadOnly=You cannot run %S from a read-only file system. Please copy
%S to another location before trying to use it.
+profileReadOnlyMac=You cannot run %S from a read-only file system. Please
copy %S to your Desktop or Applications folder before trying to use it.
+profileAccessDenied=%S does not have permission to access the profile. Please
adjust your file system permissions and try again.
# Profile manager
# LOCALIZATION NOTE (profileTooltip): First %S is the profile name, second %S
is the path to the profile folder.
profileTooltip=Profile: â%Sâ â Path: â%Sâ
diff --git a/toolkit/profile/nsToolkitProfileService.cpp
b/toolkit/profile/nsToolkitProfileService.cpp
index b80291179219..90eb336cb3d2 100644
--- a/toolkit/profile/nsToolkitProfileService.cpp
+++ b/toolkit/profile/nsToolkitProfileService.cpp
@@ -1159,9 +1159,10 @@ nsToolkitProfileService::SelectStartupProfile(
}
bool wasDefault;
+ ProfileStatus profileStatus;
nsresult rv =
SelectStartupProfile(, argv.get(), aIsResetting, aRootDir,
aLocalDir,
- aProfile, aDidCreate, );
+ aProfile, aDidCreate, , profileStatus);
// Since we were called outside of the normal startup path complete any
// startup tasks.
@@ -1194,7 +1195,8 @@ nsToolkitProfileService::SelectStartupProfile(
nsresult nsToolkitProfileService::SelectStartupProfile(
int* aArgc, char* aArgv[], bool aIsResetting, nsIFile** aRootDir,
nsIFile** aLocalDir, nsIToolkitProfile** aProfile, bool* aDidCreate,
-bool* aWasDefaultSelection) {
+bool* aWasDefaultSelection, ProfileStatus& aProfileStatus) {
+ aProfileStatus = PROFILE_STATUS_OK;
if (mStartupProfileSelected) {
return NS_ERROR_ALREADY_INITIALIZED;
}
@@ -1288,6 +1290,13 @@ nsresult nsToolkitProfileService::SelectStartupProfile(
rv = XRE_GetFileFromPath(arg, getter_AddRefs(lf));
NS_ENSURE_SUCCESS(rv, rv);
+aProfileStatus = CheckProfileWriteAccess(lf);
+if (PROFILE_STATUS_OK != aProfileStatus) {
+ NS_ADDREF(*aRootDir = lf);
+ NS_ADDREF(*aLocalDir = lf);
+ return NS_ERROR_FAILURE;
+}
+
// Make sure that the profile path exists and it's a directory.
bool exists;
rv = lf->Exists();
@@ -2081,3 +2090,47 @@ nsresult XRE_GetFileFromPath(const char* aPath,
nsIFile** aResult) {
# error Platform-specific logic needed here.
#endif
}
+
+// Check for write permission to the profile directory by trying to create a
+// new file (after ensuring that no file with the same name exists).
+ProfileStatus nsToolkitProfileService::CheckProfileWriteAccess(
+nsIFile* aProfileDir) {
+#if defined(XP_UNIX)
+ constexpr auto writeTestFileName = u".parentwritetest"_ns;
+#else
+ constexpr auto writeTestFileName = u"parent.writetest"_ns;
+#endif
+
+ nsCOMPtr writeTestFile;
+ nsresult rv = aProfileDir->Clone(getter_AddRefs(writeTestFile));
+ if (NS_SUCCEEDED(rv)) rv = writeTestFile->Append(writeTestFileName);
+
+ if (NS_SUCCEEDED(rv)) {
+bool doesExist = false;
+rv = writeTestFile->Exists();
+if (NS_SUCCEEDED(rv) && doesExist) rv = writeTestFile->Remove(true);
+ }
+
+ if (NS_SUCCEEDED(rv)) {
+rv = writeTestFile->Create(nsIFile::NORMAL_FILE_TYPE, 0666);
+
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 9173: Change the default Firefox profile directory to be TBB-relative.
commit 057039ee2d358cea9ba635a950daa0daff312536
Author: Kathy Brade
Date: Fri Oct 18 15:20:06 2013 -0400
Bug 9173: Change the default Firefox profile directory to be TBB-relative.
This should eliminate our need to rely on a wrapper script that
sets /Users/arthur and launches Firefox with -profile.
---
toolkit/profile/nsToolkitProfileService.cpp | 5 +-
toolkit/xre/nsAppRunner.cpp | 2 +-
toolkit/xre/nsConsoleWriter.cpp | 2 +-
toolkit/xre/nsXREDirProvider.cpp| 149 ++--
toolkit/xre/nsXREDirProvider.h | 16 +--
xpcom/io/nsAppFileLocationProvider.cpp | 97 +++---
6 files changed, 84 insertions(+), 187 deletions(-)
diff --git a/toolkit/profile/nsToolkitProfileService.cpp
b/toolkit/profile/nsToolkitProfileService.cpp
index 7391b79d4102..b80291179219 100644
--- a/toolkit/profile/nsToolkitProfileService.cpp
+++ b/toolkit/profile/nsToolkitProfileService.cpp
@@ -724,10 +724,11 @@ nsresult nsToolkitProfileService::Init() {
NS_ASSERTION(gDirServiceProvider, "No dirserviceprovider!");
nsresult rv;
- rv = nsXREDirProvider::GetUserAppDataDirectory(getter_AddRefs(mAppData));
+ rv = gDirServiceProvider->GetUserAppDataDirectory(getter_AddRefs(mAppData));
NS_ENSURE_SUCCESS(rv, rv);
- rv = nsXREDirProvider::GetUserLocalDataDirectory(getter_AddRefs(mTempData));
+ rv =
+
gDirServiceProvider->GetUserLocalDataDirectory(getter_AddRefs(mTempData));
NS_ENSURE_SUCCESS(rv, rv);
rv = mAppData->Clone(getter_AddRefs(mProfileDBFile));
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 5eb43aa0ae63..761c5975f5b5 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -3716,7 +3716,7 @@ int XREMain::XRE_mainInit(bool* aExitFlag) {
if ((mAppData->flags & NS_XRE_ENABLE_CRASH_REPORTER) &&
NS_SUCCEEDED(CrashReporter::SetExceptionHandler(xreBinDirectory))) {
nsCOMPtr file;
-rv = nsXREDirProvider::GetUserAppDataDirectory(getter_AddRefs(file));
+rv = mDirProvider.GetUserAppDataDirectory(getter_AddRefs(file));
if (NS_SUCCEEDED(rv)) {
CrashReporter::SetUserAppDataDirectory(file);
}
diff --git a/toolkit/xre/nsConsoleWriter.cpp b/toolkit/xre/nsConsoleWriter.cpp
index d89ea3bde31d..4a9a6d28034a 100644
--- a/toolkit/xre/nsConsoleWriter.cpp
+++ b/toolkit/xre/nsConsoleWriter.cpp
@@ -29,7 +29,7 @@ void WriteConsoleLog() {
} else {
if (!gLogConsoleErrors) return;
-rv = nsXREDirProvider::GetUserAppDataDirectory(getter_AddRefs(lfile));
+rv = gDirServiceProvider->GetUserAppDataDirectory(getter_AddRefs(lfile));
if (NS_FAILED(rv)) return;
lfile->AppendNative("console.log"_ns);
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index 3c063036d344..50ddd05dfa6b 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -32,6 +32,7 @@
#include "nsArrayEnumerator.h"
#include "nsEnumeratorUtils.h"
#include "nsReadableUtils.h"
+#include "nsXPCOMPrivate.h" // for XPCOM_FILE_PATH_SEPARATOR
#include "SpecialSystemDirectory.h"
@@ -255,9 +256,6 @@ nsresult nsXREDirProvider::GetUserProfilesRootDir(nsIFile**
aResult) {
nsresult rv = GetUserDataDirectory(getter_AddRefs(file), false);
if (NS_SUCCEEDED(rv)) {
-#if !defined(XP_UNIX) || defined(XP_MACOSX)
-rv = file->AppendNative("Profiles"_ns);
-#endif
// We must create the profile directory here if it does not exist.
nsresult tmp = EnsureDirectoryExists(file);
if (NS_FAILED(tmp)) {
@@ -273,9 +271,6 @@ nsresult
nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult) {
nsresult rv = GetUserDataDirectory(getter_AddRefs(file), true);
if (NS_SUCCEEDED(rv)) {
-#if !defined(XP_UNIX) || defined(XP_MACOSX)
-rv = file->AppendNative("Profiles"_ns);
-#endif
// We must create the profile directory here if it does not exist.
nsresult tmp = EnsureDirectoryExists(file);
if (NS_FAILED(tmp)) {
@@ -1437,7 +1432,7 @@ nsresult
nsXREDirProvider::SetUserDataProfileDirectory(nsCOMPtr& aFile,
nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
bool aLocal) {
// Copied from nsAppFileLocationProvider (more or less)
- nsresult rv;
+ NS_ENSURE_ARG_POINTER(aFile);
nsCOMPtr localDir;
if (aLocal && gDataDirHomeLocal) {
@@ -1447,80 +1442,39 @@ nsresult
nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile,
return gDataDirHome->Clone(aFile);
}
-#if defined(XP_MACOSX)
- FSRef fsRef;
- OSType folderType;
- if (aLocal) {
-folderType = kCachedDataFolderType;
- } else {
-# ifdef MOZ_THUNDERBIRD
-folderType = kDomainLibraryFolderType;
-# else
-folderType = kApplicationSupportFolderType;
-# endif
- }
- OSErr err = ::FSFindFolder(kUserDomain, folderType, kCreateFolder, );
- NS_ENSURE_FALSE(err, NS_ERROR_FAILURE);
-
- rv =
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 16439: Remove screencasting code
commit ece7b2c06e4e327e3c9005df0119c64a5179ce1f Author: Kathy Brade Date: Wed Jun 24 11:01:11 2015 -0400 Bug 16439: Remove screencasting code We avoid including the screencasting code on mobile (it got ripped out for desktop in bug 1393582) by simply excluding the related JS modules from Tor Browser. --- toolkit/modules/moz.build | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index b34e9e1df874..5e72841c8ef6 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -263,10 +263,11 @@ if "Android" != CONFIG["OS_TARGET"]: ] else: DEFINES["ANDROID"] = True -EXTRA_JS_MODULES += [ -"secondscreen/RokuApp.jsm", -"secondscreen/SimpleServiceDiscovery.jsm", -] +if not CONFIG["TOR_BROWSER_VERSION"]: +EXTRA_JS_MODULES += [ +"secondscreen/RokuApp.jsm", +"secondscreen/SimpleServiceDiscovery.jsm", +] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Add TorStrings module for localization
commit 57f4566fef9966e97af0539fa16fcf02b9767bbf
Author: Alex Catarineu
Date: Fri Jul 24 21:15:20 2020 +0200
Add TorStrings module for localization
---
browser/modules/TorStrings.jsm | 490 +
browser/modules/moz.build | 1 +
2 files changed, 491 insertions(+)
diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm
new file mode 100644
index ..e8a8d37ae373
--- /dev/null
+++ b/browser/modules/TorStrings.jsm
@@ -0,0 +1,490 @@
+"use strict";
+
+var EXPORTED_SYMBOLS = ["TorStrings"];
+
+const { XPCOMUtils } = ChromeUtils.import(
+ "resource://gre/modules/XPCOMUtils.jsm"
+);
+const { Services } = ChromeUtils.import(
+ "resource://gre/modules/Services.jsm"
+);
+const { getLocale } = ChromeUtils.import(
+ "resource://torbutton/modules/utils.js"
+);
+
+XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]);
+XPCOMUtils.defineLazyGetter(this, "domParser", () => {
+ const parser = new DOMParser();
+ parser.forceEnableDTD();
+ return parser;
+});
+
+/*
+ Tor DTD String Bundle
+
+ DTD strings loaded from torbutton/tor-launcher, but provide a fallback in
case they aren't available
+*/
+class TorDTDStringBundle {
+ constructor(aBundleURLs, aPrefix) {
+let locations = [];
+for (const [index, url] of aBundleURLs.entries()) {
+ locations.push(`%dtd_${index};`);
+}
+this._locations = locations;
+this._prefix = aPrefix;
+ }
+
+ // copied from testing/marionette/l10n.js
+ localizeEntity(urls, id) {
+// Use the DOM parser to resolve the entity and extract its real value
+let header = ``;
+let elem = `&${id};`;
+let doc = domParser.parseFromString(header + elem, "text/xml");
+let element = doc.querySelector("elem[id='elementID']");
+
+if (element === null) {
+ throw new Error(`Entity with id='${id}' hasn't been found`);
+}
+
+return element.textContent;
+ }
+
+ getString(key, fallback) {
+if (key) {
+ try {
+return this.localizeEntity(this._bundleURLs, `${this._prefix}${key}`);
+ } catch (e) {}
+}
+
+// on failure, assign the fallback if it exists
+if (fallback) {
+ return fallback;
+}
+// otherwise return string key
+return `$(${key})`;
+ }
+}
+
+/*
+ Tor Property String Bundle
+
+ Property strings loaded from torbutton/tor-launcher, but provide a fallback
in case they aren't available
+*/
+class TorPropertyStringBundle {
+ constructor(aBundleURL, aPrefix) {
+try {
+ this._bundle = Services.strings.createBundle(aBundleURL);
+} catch (e) {}
+
+this._prefix = aPrefix;
+ }
+
+ getString(key, fallback) {
+if (key) {
+ try {
+return this._bundle.GetStringFromName(`${this._prefix}${key}`);
+ } catch (e) {}
+}
+
+// on failure, assign the fallback if it exists
+if (fallback) {
+ return fallback;
+}
+// otherwise return string key
+return `$(${key})`;
+ }
+}
+
+/*
+ Security Level Strings
+*/
+var TorStrings = {
+ /*
+Tor Browser Security Level Strings
+ */
+ securityLevel: (function() {
+let tsb = new TorDTDStringBundle(
+ ["chrome://torbutton/locale/torbutton.dtd"],
+ "torbutton.prefs.sec_"
+);
+let getString = function(key, fallback) {
+ return tsb.getString(key, fallback);
+};
+
+// read localized strings from torbutton; but use hard-coded en-US strings
as fallbacks in case of error
+let retval = {
+ securityLevel: getString("caption", "Security Level"),
+ customWarning: getString("custom_warning", "Custom"),
+ overview: getString(
+"overview",
+"Disable certain web features that can be used to attack your security
and anonymity."
+ ),
+ standard: {
+level: getString("standard_label", "Standard"),
+tooltip: getString("standard_tooltip", "Security Level : Standard"),
+summary: getString(
+ "standard_description",
+ "All Tor Browser and website features are enabled."
+),
+ },
+ safer: {
+level: getString("safer_label", "Safer"),
+tooltip: getString("safer_tooltip", "Security Level : Safer"),
+summary: getString(
+ "safer_description",
+ "Disables website features that are often dangerous, causing some
sites to lose functionality."
+),
+description1: getString(
+ "js_on_https_sites_only",
+ "JavaScript is disabled on non-HTTPS sites."
+),
+description2: getString(
+ "limit_typography",
+ "Some fonts and math symbols are disabled."
+),
+description3: getString(
+ "click_to_play_media",
+ "Audio and video (HTML5 media), and WebGL are click-to-play."
+),
+ },
+ safest: {
+level: getString("safest_label", "Safest"),
+tooltip: getString("safest_tooltip", "Security Level : Safest"),
+summary: getString(
+
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 12974: Disable NTLM and Negotiate HTTP Auth
commit 09251f578ee0191f1e5c24bf473d35a55ebf19c9
Author: Mike Perry
Date: Wed Aug 27 15:19:10 2014 -0700
Bug 12974: Disable NTLM and Negotiate HTTP Auth
This is technically an embargoed Mozilla bug, so I probably shouldn't
provide
too many details.
Suffice to say that NTLM and Negotiate auth are bad for Tor users, and I
doubt
very many (or any of them) actually need it.
The Mozilla bug is https://bugzilla.mozilla.org/show_bug.cgi?id=1046421
---
extensions/auth/nsHttpNegotiateAuth.cpp | 4
netwerk/protocol/http/nsHttpNTLMAuth.cpp | 3 +++
2 files changed, 7 insertions(+)
diff --git a/extensions/auth/nsHttpNegotiateAuth.cpp
b/extensions/auth/nsHttpNegotiateAuth.cpp
index 00d089163156..e83347188ff2 100644
--- a/extensions/auth/nsHttpNegotiateAuth.cpp
+++ b/extensions/auth/nsHttpNegotiateAuth.cpp
@@ -154,6 +154,10 @@
nsHttpNegotiateAuth::ChallengeReceived(nsIHttpAuthenticableChannel* authChannel,
nsIAuthModule* rawModule = (nsIAuthModule*)*continuationState;
*identityInvalid = false;
+
+ /* Always fail Negotiate auth for Tor Browser. We don't need it. */
+ return NS_ERROR_ABORT;
+
if (rawModule) {
return NS_OK;
}
diff --git a/netwerk/protocol/http/nsHttpNTLMAuth.cpp
b/netwerk/protocol/http/nsHttpNTLMAuth.cpp
index 0a30de051014..891aaadfd758 100644
--- a/netwerk/protocol/http/nsHttpNTLMAuth.cpp
+++ b/netwerk/protocol/http/nsHttpNTLMAuth.cpp
@@ -168,6 +168,9 @@
nsHttpNTLMAuth::ChallengeReceived(nsIHttpAuthenticableChannel* channel,
*identityInvalid = false;
+ /* Always fail Negotiate auth for Tor Browser. We don't need it. */
+ return NS_ERROR_ABORT;
+
// Start a new auth sequence if the challenge is exactly "NTLM".
// If native NTLM auth apis are available and enabled through prefs,
// try to use them.
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 13028: Prevent potential proxy bypass cases.
commit d30b688bea40e57cef94d7bcf016c9fb50d42586
Author: Mike Perry
Date: Mon Sep 29 14:30:19 2014 -0700
Bug 13028: Prevent potential proxy bypass cases.
It looks like these cases should only be invoked in the NSS command line
tools, and not the browser, but I decided to patch them anyway because there
literally is a maze of network function pointers being passed around, and
it's
very hard to tell if some random code might not pass in the proper proxied
versions of the networking code here by accident.
---
security/nss/lib/certhigh/ocsp.c| 8
.../lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c | 21 +
2 files changed, 29 insertions(+)
diff --git a/security/nss/lib/certhigh/ocsp.c b/security/nss/lib/certhigh/ocsp.c
index cea8456606bf..86fa971cfbef 100644
--- a/security/nss/lib/certhigh/ocsp.c
+++ b/security/nss/lib/certhigh/ocsp.c
@@ -2932,6 +2932,14 @@ ocsp_ConnectToHost(const char *host, PRUint16 port)
PRNetAddr addr;
char *netdbbuf = NULL;
+// XXX: Do we need a unittest ifdef here? We don't want to break the
tests, but
+// we want to ensure nothing can ever hit this code in production.
+#if 1
+printf("Tor Browser BUG: Attempted OSCP direct connect to %s, port %u\n",
host,
+port);
+goto loser;
+#endif
+
sock = PR_NewTCPSocket();
if (sock == NULL)
goto loser;
diff --git a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
index e8698376b5be..85791d84a932 100644
--- a/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
+++ b/security/nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_socket.c
@@ -1334,6 +1334,13 @@ pkix_pl_Socket_Create(
plContext),
PKIX_COULDNOTCREATESOCKETOBJECT);
+// XXX: Do we need a unittest ifdef here? We don't want to break the
tests, but
+// we want to ensure nothing can ever hit this code in production.
+#if 1
+printf("Tor Browser BUG: Attempted pkix direct socket connect\n");
+PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED);
+#endif
+
socket->isServer = isServer;
socket->timeout = timeout;
socket->clientSock = NULL;
@@ -1433,6 +1440,13 @@ pkix_pl_Socket_CreateByName(
localCopyName = PL_strdup(serverName);
+// XXX: Do we need a unittest ifdef here? We don't want to break the
tests, but
+// we want to ensure nothing can ever hit this code in production.
+#if 1
+printf("Tor Browser BUG: Attempted pkix direct connect to %s\n",
serverName);
+PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED);
+#endif
+
sepPtr = strchr(localCopyName, ':');
/* First strip off the portnum, if present, from the end of the name */
if (sepPtr) {
@@ -1582,6 +1596,13 @@ pkix_pl_Socket_CreateByHostAndPort(
PKIX_ENTER(SOCKET, "pkix_pl_Socket_CreateByHostAndPort");
PKIX_NULLCHECK_THREE(hostname, pStatus, pSocket);
+// XXX: Do we need a unittest ifdef here? We don't want to break the
tests, but
+// we want to ensure nothing can ever hit this code in production.
+#if 1
+printf("Tor Browser BUG: Attempted pkix direct connect to %s, port
%u\n", hostname,
+portnum);
+PKIX_ERROR(PKIX_PRNEWTCPSOCKETFAILED);
+#endif
prstatus = PR_GetHostByName(hostname, buf, sizeof(buf), );
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 10760: Integrate TorButton to TorBrowser core
commit 670b71716a36cad722afc1c3e7baf3a78541a22b Author: Alex Catarineu Date: Wed Feb 19 23:05:08 2020 +0100 Bug 10760: Integrate TorButton to TorBrowser core Because of the non-restartless nature of Torbutton, it required a two-stage installation process. On mobile, it was a problem, because it was not loading when the user opened the browser for the first time. Moving it to tor-browser and making it a system extension allows it to load when the user opens the browser for first time. Additionally, this patch also fixes Bug 27611. Bug 26321: New Circuit and New Identity menu items Bug 14392: Make about:tor behave like other initial pages. Bug 25013: Add torbutton as a tor-browser submodule --- .gitmodules| 3 ++ browser/base/content/aboutDialog.xhtml | 38 +++-- browser/base/content/browser-doctype.inc | 6 +++ browser/base/content/browser-menubar.inc | 47 ++ browser/base/content/browser-sets.inc | 2 + browser/base/content/browser.js| 1 + browser/base/content/browser.xhtml | 26 +++- .../controlcenter/content/identityPanel.inc.xhtml | 44 browser/installer/package-manifest.in | 2 + docshell/base/nsAboutRedirector.cpp| 6 ++- docshell/build/components.conf | 1 + mobile/android/installer/package-manifest.in | 4 ++ toolkit/moz.build | 1 + .../mozapps/extensions/internal/XPIProvider.jsm| 9 + toolkit/torproject/torbutton | 1 + .../lib/environments/browser-window.js | 6 ++- 16 files changed, 172 insertions(+), 25 deletions(-) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index ..2f03bd8e22df --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "toolkit/torproject/torbutton"] + path = toolkit/torproject/torbutton + url = https://git.torproject.org/torbutton.git diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml index 278ba71d7fcc..dd07cc118fb1 100644 --- a/browser/base/content/aboutDialog.xhtml +++ b/browser/base/content/aboutDialog.xhtml @@ -7,11 +7,11 @@ + + http://www.w3.org/1999/xhtml; @@ -28,7 +28,7 @@ data-l10n-id="aboutDialog-title" #endif role="dialog" -aria-describedby="version distribution distributionId communityDesc contributeDesc trademark" +aria-describedby="version distribution distributionId projectDesc helpDesc trademark trademarkTor" > #ifdef XP_MACOSX #include macWindow.inc.xhtml @@ -146,24 +146,36 @@ - -https://www.mozilla.org/?utm_source=firefox-browserutm_medium=firefox-desktoputm_campaign=about-dialog; data-l10n-name="community-mozillaLink"/> - + + + + + +https://www.torproject.org/;> + + - -https://donate.mozilla.org/?utm_source=firefoxutm_medium=referralutm_campaign=firefox_aboututm_content=firefox_about; data-l10n-name="helpus-donateLink"/> -https://www.mozilla.org/contribute/?utm_source=firefox-browserutm_medium=firefox-desktoputm_campaign=about-dialog; data-l10n-name="helpus-getInvolvedLink"/> + + +https://donate.torproject.org/;> + + + +https://community.torproject.org/;> + + - - - -https://www.mozilla.org/privacy/?utm_source=firefox-browserutm_medium=firefox-desktoputm_campaign=about-dialog; data-l10n-id="bottomLinks-privacy"/> + +https://support.torproject.org/;> +https://community.torproject.org/relay/;> + + diff --git a/browser/base/content/browser-doctype.inc b/browser/base/content/browser-doctype.inc index db2242afacfd..ef5a370ac8c6 100644 --- a/browser/base/content/browser-doctype.inc +++ b/browser/base/content/browser-doctype.inc @@ -12,3 +12,9 @@ %syncBrandDTD; %brandingsDTD; + +%torbuttonDTD; + +%aboutTorDTD; + +%aboutDialogDTD; diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index 27119ac8b182..a11612904221 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -38,6 +38,18 @@ command="Tools:NonFissionWindow" accesskey="s" label="New Non-Fission Window"/> #endif + + + + - +#endif + +
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 28044: Integrate Tor Launcher into tor-browser
commit 5339d9013cd6a9cb5c1441fc4fdb7623292e788c
Author: Kathy Brade
Date: Tue Feb 26 10:07:17 2019 -0500
Bug 28044: Integrate Tor Launcher into tor-browser
Build and package Tor Launcher as part of the browser (similar to
how pdfjs is handled).
If a Tor Launcher extension is present in the user's profile, it is
removed.
---
browser/extensions/moz.build| 3 +++
browser/installer/package-manifest.in | 5 +
toolkit/mozapps/extensions/internal/XPIProvider.jsm | 10 ++
3 files changed, 18 insertions(+)
diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build
index 269dcb2a32d6..9daae31eca43 100644
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -12,3 +12,6 @@ DIRS += [
"report-site-issue",
"pictureinpicture",
]
+
+if not CONFIG["TOR_BROWSER_DISABLE_TOR_LAUNCHER"]:
+DIRS += ["tor-launcher"]
diff --git a/browser/installer/package-manifest.in
b/browser/installer/package-manifest.in
index a5148a03f0a6..30b88fc38277 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -255,6 +255,11 @@
@RESPATH@/browser/chrome/browser.manifest
@RESPATH@/chrome/pdfjs.manifest
@RESPATH@/chrome/pdfjs/*
+#ifndef TOR_BROWSER_DISABLE_TOR_LAUNCHER
+@RESPATH@/browser/chrome/torlauncher.manifest
+@RESPATH@/browser/chrome/torlauncher/*
+@RESPATH@/browser/@PREF_DIR@/torlauncher-prefs.js
+#endif
@RESPATH@/chrome/toolkit@JAREXT@
@RESPATH@/chrome/toolkit.manifest
@RESPATH@/chrome/recording.manifest
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
index 06773a773c93..f91d9e1af5cb 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -1472,6 +1472,16 @@ var XPIStates = {
for (let [id, file] of loc.readAddons()) {
knownIds.delete(id);
+// Since it is now part of the browser, uninstall the Tor Launcher
+// extension. This will remove the Tor Launcher .xpi from user
+// profiles on macOS.
+if (id === "tor-launc...@torproject.org") {
+ logger.debug("Uninstalling the Tor Launcher extension.");
+ loc.installer.uninstallAddon(id);
+ changed = true;
+ continue;
+}
+
let xpiState = loc.get(id);
if (!xpiState) {
// If the location is not supported for sideloading, skip new
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 40069: Add helpers for message passing with extensions
commit 9665bef99d5443cfe0e2c7ecc3b58278e69125a0
Author: Alex Catarineu
Date: Sun Aug 2 19:12:25 2020 +0200
Bug 40069: Add helpers for message passing with extensions
---
toolkit/components/extensions/ExtensionParent.jsm | 47 +++
1 file changed, 47 insertions(+)
diff --git a/toolkit/components/extensions/ExtensionParent.jsm
b/toolkit/components/extensions/ExtensionParent.jsm
index 496a9d80e973..3bc145d8136e 100644
--- a/toolkit/components/extensions/ExtensionParent.jsm
+++ b/toolkit/components/extensions/ExtensionParent.jsm
@@ -264,6 +264,8 @@ const ProxyMessenger = {
/** @type Map */
ports: new Map(),
+ _torRuntimeMessageListeners: [],
+
init() {
this.conduit = new BroadcastConduit(ProxyMessenger, {
id: "ProxyMessenger",
@@ -326,6 +328,10 @@ const ProxyMessenger = {
},
async recvRuntimeMessage(arg, { sender }) {
+// We need to listen to some extension messages in Tor Browser
+for (const listener of this._torRuntimeMessageListeners) {
+ listener(arg);
+}
arg.firstResponse = true;
let kind = await this.normalizeArgs(arg, sender);
let result = await this.conduit.castRuntimeMessage(kind, arg);
@@ -1878,6 +1884,45 @@ for (let name of StartupCache.STORE_NAMES) {
StartupCache[name] = new CacheStore(name);
}
+async function torSendExtensionMessage(extensionId, message) {
+ // This should broadcast the message to all children "conduits"
+ // listening for a "RuntimeMessage". Those children conduits
+ // will either be extension background pages or other extension
+ // pages listening to browser.runtime.onMessage.
+ const result = await ProxyMessenger.conduit.castRuntimeMessage("messenger", {
+extensionId,
+holder: new StructuredCloneHolder(message),
+firstResponse: true,
+sender: {
+ id: extensionId,
+ envType: "addon_child",
+},
+ });
+ return result
+? result.value
+: Promise.reject({ message: ERROR_NO_RECEIVERS });
+}
+
+async function torWaitForExtensionMessage(extensionId, checker) {
+ return new Promise(resolve => {
+const msgListener = msg => {
+ try {
+if (msg && msg.extensionId === extensionId) {
+ const deserialized = msg.holder.deserialize({});
+ if (checker(deserialized)) {
+const idx = ProxyMessenger._torRuntimeMessageListeners.indexOf(
+ msgListener
+);
+ProxyMessenger._torRuntimeMessageListeners.splice(idx, 1);
+resolve(deserialized);
+ }
+}
+ } catch (e) {}
+};
+ProxyMessenger._torRuntimeMessageListeners.push(msgListener);
+ });
+}
+
var ExtensionParent = {
GlobalManager,
HiddenExtensionPage,
@@ -1889,6 +1934,8 @@ var ExtensionParent = {
promiseExtensionViewLoaded,
watchExtensionProxyContextLoad,
DebugUtils,
+ torSendExtensionMessage,
+ torWaitForExtensionMessage,
};
// browserPaintedPromise and browserStartupPromise are promises that
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] Bug 12620: TorBrowser regression tests
commit 42a04f7a93429f0d8b7a99708128fb4ac2dfccbd
Author: Arthur Edelstein
Date: Wed Aug 27 16:25:00 2014 -0700
Bug 12620: TorBrowser regression tests
Regression tests for Bug #2950: Make Permissions Manager memory-only
Regression tests for TB4: Tor Browser's Firefox preference overrides.
Note: many more functional tests could be made here
Regression tests for #2874: Block Components.interfaces from content
Bug 18923: Add a script to run all Tor Browser specific tests
Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt.
---
run-tbb-tests| 66 +++
tbb-tests-ignore.txt | 13 +++
tbb-tests/browser.ini| 5 +++
tbb-tests/browser_tor_TB4.js | 35 +++
tbb-tests/browser_tor_bug2950.js | 74
tbb-tests/mochitest.ini | 3 ++
tbb-tests/moz.build | 9 +
tbb-tests/test_tor_bug2874.html | 25 ++
toolkit/toolkit.mozbuild | 3 +-
9 files changed, 232 insertions(+), 1 deletion(-)
diff --git a/run-tbb-tests b/run-tbb-tests
new file mode 100755
index ..bc09839f9f05
--- /dev/null
+++ b/run-tbb-tests
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+# This script runs all the Mochitest tests that have been added or
+# modified since the last ffxbld commit.
+#
+# It does not currently run XPCShell tests. We should change this if we
+# start using this type or other types of tests.
+#
+# The logs of the tests are stored in the tbb-tests.log file.
+# Ignored tests are listed in the tbb-tests-ignore.txt file.
+#
+# https://trac.torproject.org/projects/tor/ticket/18923
+
+IFS=$'\n'
+
+if [ -n "$USE_TESTS_LIST" ] && [ -f tbb-tests-list.txt ]
+then
+echo "Using tests list from file tbb-tests-list.txt"
+tests=($(cat tbb-tests-list.txt))
+else
+ffxbld_commit=$(git log -500 --format='oneline' | grep "TB3: Tor Browser's
official .mozconfigs." \
+| head -1 | cut -d ' ' -f 1)
+
+tests=($(git diff --name-status "$ffxbld_commit" HEAD | \
+grep -e '^[AM].*/test_[^/]\+\.\(html\|xul\)$' \
+ -e '^[AM].*/browser_[^/]\+\.js$' \
+ | sed 's/^[AM]\s\+//'))
+fi
+
+echo 'The following tests will be run:'
+for i in "${!tests[@]}"
+do
+if [ -z "$USE_TESTS_LIST" ] \
+&& grep -q "^${tests[$i]}$" tbb-tests-ignore.txt
+then
+unset "tests[$i]"
+continue
+fi
+echo "- ${tests[$i]}"
+done
+
+if [ -n "$WRITE_TESTS_LIST" ]
+then
+rm -f tbb-tests-list.txt
+for i in "${!tests[@]}"
+do
+echo "${tests[$i]}" >> tbb-tests-list.txt
+done
+exit 0
+fi
+
+rm -f tbb-tests.log
+echo $'\n''Starting tests'
+# We need `security.nocertdb = false` because of #18087. That pref is
+# forced to have the same value as `browser.privatebrowsing.autostart` in
+# torbutton, so we just set `browser.privatebrowsing.autostart=false` here.
+./mach mochitest --log-tbpl tbb-tests.log \
+--setpref network.file.path_blacklist='' \
+--setpref extensions.torbutton.use_nontor_proxy=true \
+--setpref browser.privatebrowsing.autostart=false \
+ "${tests[@]}"
+
+echo "*"
+echo "*"
+echo "Summary of failed tests:"
+grep --color=never TEST-UNEXPECTED-FAIL tbb-tests.log
diff --git a/tbb-tests-ignore.txt b/tbb-tests-ignore.txt
new file mode 100644
index ..ee3927a9e7c4
--- /dev/null
+++ b/tbb-tests-ignore.txt
@@ -0,0 +1,13 @@
+browser/extensions/onboarding/test/browser/browser_onboarding_accessibility.js
+browser/extensions/onboarding/test/browser/browser_onboarding_keyboard.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_2.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_3.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_4.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_5.js
+browser/extensions/onboarding/test/browser/browser_onboarding_notification_click_auto_complete_tour.js
+browser/extensions/onboarding/test/browser/browser_onboarding_select_default_tour.js
+browser/extensions/onboarding/test/browser/browser_onboarding_skip_tour.js
+browser/extensions/onboarding/test/browser/browser_onboarding_tours.js
+browser/extensions/onboarding/test/browser/browser_onboarding_tourset.js
+browser/extensions/onboarding/test/browser/browser_onboarding_uitour.js
diff --git a/tbb-tests/browser.ini b/tbb-tests/browser.ini
new file mode 100644
index ..f481660f1417
--- /dev/null
+++ b/tbb-tests/browser.ini
@@ -0,0 +1,5 @@
+[DEFAULT]
+
+[browser_tor_bug2950.js]
+[browser_tor_omnibox.js]
+[browser_tor_TB4.js]
diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js
new file mode 100644
index
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] TB4: Tor Browser's Firefox preference overrides.
commit d766853889c0cbdb31e6111c4708d965b5227887 Author: Mike Perry Date: Tue Sep 10 18:20:43 2013 -0700 TB4: Tor Browser's Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera ) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned
[tor-commits] [tor-browser/tor-browser-88.0-10.5-1] TB3: Tor Browser's official .mozconfigs.
commit 90ab53505186e875a3c94183e4c8d0e2213109b2 Author: Mike Perry Date: Mon May 6 15:51:06 2013 -0700 TB3: Tor Browser's official .mozconfigs. Also: Bug #9829.1: new .mozconfig file for the new cross-compiler and ESR24 Changes needed to build Mac in 64bit Bug 10715: Enable Webgl for mingw-w64 again. Disable ICU when cross-compiling; clean-up. Bug 15773: Enable ICU on OS X Bug 15990: Don't build the sandbox with mingw-w64 Bug 12761: Switch to ESR 38 for OS X Updating .mozconfig-asan Bug 12516: Compile hardenend Tor Browser with -fwrapv Bug 18331: Switch to Mozilla's toolchain for building Tor Browser for OS X Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 13419: Add back ICU for Windows Bug 21239: Use GTK2 for ESR52 Linux builds Bug 23025: Add hardening flags for macOS Bug 24478: Enable debug assertions and tests in our ASan builds --enable-proxy-bypass-protection Bug 27597: ASan build option in tor-browser-build is broken Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 31450: Set proper BINDGEN_CFLAGS for ASan builds Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 21849: Don't allow SSL key logging. Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 25741 - TBA: Disable features at compile-time MOZ_NATIVE_DEVICES for casting and the media player MOZ_TELEMETRY_REPORTING for telemetry MOZ_DATA_REPORTING for all data reporting preferences (crashreport, telemetry, geo) Bug 25741 - TBA: Add default configure options in dedicated file Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 29859: Disable HLS support for now Add --disable-tor-launcher build option Add --enable-tor-browser-update build option Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40061: Omit the Windows default browser agent from the build Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files --- .mozconfig| 39 .mozconfig-android| 36 ++ .mozconfig-asan | 44 +++ .mozconfig-mac| 56 +++ .mozconfig-mingw | 31 +++ browser/base/moz.build| 3 ++ browser/installer/Makefile.in | 8 + browser/moz.configure | 8 ++--- build/moz.configure/old.configure | 5 mobile/android/confvars.sh| 9 ++ mobile/android/geckoview/build.gradle | 1 + mobile/android/moz.configure | 22 -- mobile/android/torbrowser.configure | 30 +++ old-configure.in | 49 ++ security/moz.build| 2 +- security/nss/lib/ssl/Makefile | 2 +- toolkit/modules/AppConstants.jsm | 15 ++ toolkit/modules/moz.build | 3 ++ 18 files changed, 355 insertions(+), 8 deletions(-) diff --git a/.mozconfig b/.mozconfig new file mode 100755 index ..18cd1f9b6487 --- /dev/null +++ b/.mozconfig @@ -0,0 +1,39 @@ +. $topsrcdir/browser/config/mozconfig + +# This mozconfig file is not used in official Tor Browser builds. +# It is only intended to be used when doing incremental Linux builds +# during development. The platform-specific mozconfig configuration +# files used in official Tor Browser releases can be found in the +# tor-browser-build repo: +# https://gitweb.torproject.org/builders/tor-browser-build.git/ +# under: +# tor-browser-build/projects/firefox/mozconfig-$OS-$ARCH + +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" +export MOZILLA_OFFICIAL=1 + +ac_add_options --enable-optimize +ac_add_options
[tor-commits] [tor-browser-build/master] Release preparations for 10.5a15
commit 2d12f1087ea0cc0640c880bcb6c897408e8aabcd
Author: Matthew Finkel
Date: Wed Apr 21 02:44:41 2021 +
Release preparations for 10.5a15
Versions bump and Changelog update
---
projects/android-components/config | 2 +-
.../gradle-dependencies-list.txt | 8 +-
projects/fenix/config | 2 +-
projects/fenix/gradle-dependencies-list.txt| 366 ++---
projects/firefox/config| 4 +-
projects/geckoview/config | 4 +-
.../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 15 +
projects/tor/config| 2 +-
rbm.conf | 4 +-
9 files changed, 210 insertions(+), 197 deletions(-)
diff --git a/projects/android-components/config
b/projects/android-components/config
index 5284ce7..e5ddfe0 100644
--- a/projects/android-components/config
+++ b/projects/android-components/config
@@ -8,7 +8,7 @@ gpg_keyring: torbutton.gpg
variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]'
var:
- android_components_version: 74.0.6
+ android_components_version: 74.0.10
torbrowser_branch: 10.5
container:
use_container: 1
diff --git a/projects/android-components/gradle-dependencies-list.txt
b/projects/android-components/gradle-dependencies-list.txt
index ab3da10..93f040d 100644
--- a/projects/android-components/gradle-dependencies-list.txt
+++ b/projects/android-components/gradle-dependencies-list.txt
@@ -385,12 +385,12 @@
d1741144ed2ea215a84f5d94d779cafcfaf778cce8cc7224437a2884cb1101bc | https://maven
7b0a3bd6d32c8002f785db8fdbf3b08e3541366e784cac1304cb3f49642b916a |
https://maven.mozilla.org/maven2/org/mozilla/components/support-ktx/71.0.0/support-ktx-71.0.0.pom
f7bf27270904abd8639b543151b6eaf268b821b8e6235c8decf8031e02ec8648 |
https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.0/support-utils-71.0.0.aar
0b80acf7d1dd0d9484b0e82cd1a04ae57270d7f7e6b339ce39424554d48798e3 |
https://maven.mozilla.org/maven2/org/mozilla/components/support-utils/71.0.0/support-utils-71.0.0.pom
-4c496ab63c3900ebbd9bde50d520c28c29ddd594ae3958f161f41a5810ba60fa |
https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/88.0.20210404185932/geckoview-beta-88.0.20210404185932.aar
-e55a5d7ebdd6cae43d2a820c16f771ad8d87f25b181828ebd10c721f8ad445dc |
https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/88.0.20210404185932/geckoview-beta-88.0.20210404185932.pom
+cd7d0e09420351e9e69277083b263c8f0aad75a4bac3153776caf1424efae653 |
https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/88.0.20210410185959/geckoview-beta-88.0.20210410185959.aar
+e1913ae393cae4186dd8603fbbf11f7b76720a216ce3132319a13d57d575f558 |
https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-beta/88.0.20210410185959/geckoview-beta-88.0.20210410185959.pom
d622b92149ed8477aca47dabe0fd53de75191a29ff4d79a0cfc718736bb4aa2a |
https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/89.0.20210323094659/geckoview-nightly-89.0.20210323094659.aar
8d6bc0c248af8f3d1f4f45abd4e04bf76044fbce518ca3c384ff83fe9acb38b4 |
https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview-nightly/89.0.20210323094659/geckoview-nightly-89.0.20210323094659.pom
-418b2052928c75f4071b533cf864baaf22d0f134f6418200b8ab807c93428161 |
https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/87.0.20210318103112/geckoview-87.0.20210318103112.aar
-9c4b5dd3e37936890909a0795be552664dd861f9f28a9815a72a4abc7660c700 |
https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/87.0.20210318103112/geckoview-87.0.20210318103112.pom
+891bddc531733128099868a0c5b735bdf8a9248279e73c800cdbfe663a011071 |
https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/88.0.20210412175251/geckoview-88.0.20210412175251.aar
+7b04e436f5f8f16565f245b451e7929a0ba907726efa371dde93e2c8e6c74f04 |
https://maven.mozilla.org/maven2/org/mozilla/geckoview/geckoview/88.0.20210412175251/geckoview-88.0.20210412175251.pom
1eb5321d64bdd07865bd8599b6b981193b54661f25bbb8e3ccdc6f8210c9ae38 |
https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/35.0.0/glean-forUnitTests-35.0.0.jar
f62de54f66aa4086100f26884927dbff06a1cbea7fb17010312d10d71cea3f01 |
https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-forUnitTests/35.0.0/glean-forUnitTests-35.0.0.pom
624e642862770feb72c22cd80cd96f0e5d53340ded862987b3ec9c537c8bed29 |
https://maven.mozilla.org/maven2/org/mozilla/telemetry/glean-gradle-plugin/35.0.0/glean-gradle-plugin-35.0.0.jar
diff --git a/projects/fenix/config b/projects/fenix/config
index ff87d4b..415c8fb 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -8,7 +8,7 @@ gpg_keyring: torbutton.gpg
variant: Beta
var:
- fenix_version: 88.0.0b4
+ fenix_version: 88.1.0
torbrowser_branch: 10.5
copyright_year: '[% exec("git show
[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
commit 82ca4ea685f674808ce41157ed5e61a19a2abd7d Author: Translation commit bot Date: Wed Apr 21 00:45:46 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- en_GB.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/en_GB.po b/en_GB.po index 34a3e1c8af..e3bb61212e 100644 --- a/en_GB.po +++ b/en_GB.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-19 08:20+0200\n" -"PO-Revision-Date: 2021-04-19 09:15+\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-04-21 00:15+\n" +"Last-Translator: Andi Chandler \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -199,7 +199,7 @@ msgstr "An error occured while updating the signing key.\\n\\nThis pre #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:304 msgid "Error while downloading the signing key" -msgstr "" +msgstr "Error while downloading the signing key" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:316 msgid "Error while updating the signing key" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
commit 7e2e142947f8ede3af38d4d1579ef5543f53fc3c Author: Translation commit bot Date: Wed Apr 21 00:16:25 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- en_GB.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en_GB.po b/en_GB.po index 1a0116da37..fe98266e90 100644 --- a/en_GB.po +++ b/en_GB.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-19 08:20+0200\n" -"PO-Revision-Date: 2021-04-19 09:15+\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-04-21 00:15+\n" +"Last-Translator: Andi Chandler \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
commit c9b493f7405559ece62ccb484dcd4d83366044bc Author: Translation commit bot Date: Tue Apr 20 23:15:02 2021 + https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- my/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/my/aboutTor.dtd b/my/aboutTor.dtd index bdde5b280f..06bc341034 100644 --- a/my/aboutTor.dtd +++ b/my/aboutTor.dtd @@ -19,7 +19,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [Git][tpo/applications/android-components] Pushed new branch android-components-74.0.10-10.5-1
Matthew Finkel pushed new branch android-components-74.0.10-10.5-1 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/android-components-74.0.10-10.5-1 You're receiving this email because of your account on gitlab.torproject.org. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
commit abdef7f634b325a6b00d63d939bcc849d275dedf Author: Translation commit bot Date: Tue Apr 20 21:16:39 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- sv.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv.po b/sv.po index 241303ce40..f3112d088c 100644 --- a/sv.po +++ b/sv.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-19 08:20+0200\n" -"PO-Revision-Date: 2021-04-19 09:15+\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-04-20 20:57+\n" +"Last-Translator: Jonatan Nyberg \n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
commit 0eb29dee70298e396ff229a6642d0ed2c9b92f8a Author: Translation commit bot Date: Tue Apr 20 21:15:48 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- sv.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv.po b/sv.po index f828d73fe2..d5e0d87b91 100644 --- a/sv.po +++ b/sv.po @@ -25,8 +25,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-19 08:20+0200\n" -"PO-Revision-Date: 2021-04-19 09:15+\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-04-20 20:57+\n" +"Last-Translator: Jonatan Nyberg \n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -212,7 +212,7 @@ msgstr "Ett fel uppstod vid uppdatering av signeringsnyckeln.\\n\\nDet #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:304 msgid "Error while downloading the signing key" -msgstr "" +msgstr "Fel vid hämtning av signeringsnyckeln" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:316 msgid "Error while updating the signing key" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [Git][tpo/applications/fenix] Pushed new branch tor-browser-88.1.0-10.5-1
Matthew Finkel pushed new branch tor-browser-88.1.0-10.5-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-88.1.0-10.5-1 You're receiving this email because of your account on gitlab.torproject.org. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Add Burmese localization of Tor Browser (Stable)
commit d16f464ddea0a6fa4dd91bcc677713df50d33de7 Author: Matthew Finkel Date: Tue Apr 20 20:08:20 2021 + Add Burmese localization of Tor Browser (Stable) --- content/download/languages/contents.lr | 2 +- databags/download-alternatives.ini | 4 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/content/download/languages/contents.lr b/content/download/languages/contents.lr index 20892b92..2c34326a 100644 --- a/content/download/languages/contents.lr +++ b/content/download/languages/contents.lr @@ -11,4 +11,4 @@ color: dark title: Download Tor Browser in your language --- body: -We want everyone to be able to enjoy Tor Browser in their own language. Tor Browser is now available in 35 different languages, and we are working to add more. Want to help us translate? [See here](https://community.torproject.org/localization/) +We want everyone to be able to enjoy Tor Browser in their own language. Tor Browser is now available in 36 different languages, and we are working to add more. Want to help us translate? [See here](https://community.torproject.org/localization/) diff --git a/databags/download-alternatives.ini b/databags/download-alternatives.ini index 7b366d17..4a4b1755 100644 --- a/databags/download-alternatives.ini +++ b/databags/download-alternatives.ini @@ -90,6 +90,10 @@ language = македонÑки (mk) url = /ms/ language = بÙاس Ù ÙاÙÙ (ms) +[my] +url = /my/ +language = áá¼ááºáá¬á ᬠ(my) + [nb-NO] url = /nb-NO/ language = Norsk BokmÃ¥l (nb-NO) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/master] Add new Desktop Tor Browser version 10.0.16
commit 3cc93aa106ae72eb722ba80bb263a638ff1ede0b Author: Matthew Finkel Date: Tue Apr 20 19:57:39 2021 + Add new Desktop Tor Browser version 10.0.16 --- databags/versions.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index 38b57d3b..81a03fea 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,15 +1,15 @@ [torbrowser-stable] -version = 10.0.15 +version = 10.0.16 win32 = 0.4.5.7 [torbrowser-android-stable] version = 10.0.15 [torbrowser-win-stable] -version = 10.0.15 +version = 10.0.16 [torbrowser-linux-stable] -version = 10.0.15 +version = 10.0.16 [torbrowser-alpha] version = 10.5a14 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
commit bac5df3ee692048dab901c87cf9569fb82c86387 Author: Translation commit bot Date: Tue Apr 20 19:16:34 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- zh_HK.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK.po b/zh_HK.po index 4e4f2f59a7..9762386051 100644 --- a/zh_HK.po +++ b/zh_HK.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-19 08:20+0200\n" -"PO-Revision-Date: 2021-04-20 13:08+\n" +"PO-Revision-Date: 2021-04-20 18:56+\n" "Last-Translator: Adawcs\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
commit a61332e063b2e6dcac76847fcdb2b0420a859538 Author: Translation commit bot Date: Tue Apr 20 19:15:53 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- zh_HK.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_HK.po b/zh_HK.po index 590d5c7a44..9c32db556c 100644 --- a/zh_HK.po +++ b/zh_HK.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-19 08:20+0200\n" -"PO-Revision-Date: 2021-04-20 13:08+\n" +"PO-Revision-Date: 2021-04-20 18:56+\n" "Last-Translator: Adawcs\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -2200,7 +2200,7 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:124 msgid "Disable" -msgstr "" +msgstr "åç¨" #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:154 #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:697 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal_completed] https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed
commit 607a4ee9906fc2d42155221b30c02e496ef90521 Author: Translation commit bot Date: Tue Apr 20 16:18:09 2021 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal_completed --- contents+pt-BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index ea7a643fe8..29de54ac92 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -22,8 +22,8 @@ # Shayane Alcantara , 2020 # Gus, 2021 # André Marcelo Alvarenga , 2021 -# Emma Peel, 2021 # Daniel, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -31,7 +31,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+\n" -"Last-Translator: Daniel, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
commit 125f021d3ea80f46932eeb6c10a599823acf8b21 Author: Translation commit bot Date: Tue Apr 20 16:18:04 2021 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+pt-BR.po | 20 ++-- contents+ro.po| 8 ++--- contents+zh-CN.po | 92 ++- 3 files changed, 58 insertions(+), 62 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 9ef5d7a0f7..43d7f5b19a 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -22,8 +22,8 @@ # Shayane Alcantara , 2020 # Gus, 2021 # André Marcelo Alvarenga , 2021 -# Emma Peel, 2021 # Daniel, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -31,7 +31,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+\n" -"Last-Translator: Daniel, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2711,8 +2711,8 @@ msgid "" "directly to the Tor network." msgstr "" "Se isto te importa, você pode reduzir o risco ao configurar o Tor para usar " -"uma [ponte] (https://tb-manual.torproject.org/bridges/) ao invés de " -"conectar-se diretamente na rede Tor." +"uma [ponte](https://tb-manual.torproject.org/bridges/) ao invés de conectar-" +"se diretamente na rede Tor." #: https//support.torproject.org/faq/staying-anonymous/ #: (content/faq/staying-anonymous/contents+en.lrquestion.description) @@ -7943,8 +7943,8 @@ msgid "" "[torrc](https://support.torproject.org/tbb/tbb-editing-torrc/) blank, and " "Tor will guess." msgstr "" -"Apenas deixe em branco a linha \"endereço\" no seu [torrc] " -"(https://support.torproject.org/tbb/tbb-editing-torrc/) e o Tor irá " +"Apenas deixe em branco a linha \"endereço\" no seu " +"[torrc](https://support.torproject.org/tbb/tbb-editing-torrc/) e o Tor irá " "entender." #: https//support.torproject.org/operators/exit-policies/ @@ -9983,7 +9983,7 @@ msgid "" "tracker](https://gitlab.torproject.org/groups/tpo/web/-/issues)." msgstr "" "Questões relacionadas a nossos websites devem ser enviadas para o nosso " -"[repositório Web] (https://gitlab.torproject.org/groups/tpo/web/-/issues)." +"[repositório Web](https://gitlab.torproject.org/groups/tpo/web/-/issues)." #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -12432,9 +12432,9 @@ msgid "" msgstr "" "Finalmente, se você souber de uma rede IRC que parece estar bloqueando o Tor" " ou um único nós de saÃda do Tor, por favor, coloque essa informação no " -"[rastreador de bloqueio IRC Tor] " -"(https://trac.torproject.org/projects/tor/wiki/doc/BlockingIrc) assim outros" -" podem compartilhar. " +"[rastreador de bloqueio IRC " +"Tor](https://trac.torproject.org/projects/tor/wiki/doc/BlockingIrc) assim " +"outros podem compartilhar. " #: https//support.torproject.org/abuse/tor-ban-irc/ #: (content/abuse/irc-ban/contents+en.lrquestion.description) diff --git a/contents+ro.po b/contents+ro.po index 222f7877e1..807dbdd635 100644 --- a/contents+ro.po +++ b/contents+ro.po @@ -9,8 +9,8 @@ # k piticu , 2020 # erinm, 2020 # eduard pintilie , 2020 -# Emma Peel, 2020 # Albert Regus , 2020 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -18,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+\n" -"Last-Translator: Albert Regus , 2020\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2794,8 +2794,8 @@ msgid "" "[LICENSE](https://gitweb.torproject.org/tor.git/plain/LICENSE)." msgstr "" "Cu toate acestea, dacÄ doriÈi sÄ redistribuiÈi software-ul Tor, trebuie sÄ " -"urmaÈi [LICENÈA] noastrÄ " -"(https://gitweb.torproject.org/tor.git/plain/LICENSE)." +"urmaÈi [LICENÈA](https://gitweb.torproject.org/tor.git/plain/LICENSE) " +"noastrÄ ." #: https//support.torproject.org/about/distribute-tor/ #: (content/about/distribute-tor/contents+en.lrquestion.description) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index bd7ecad1d1..652ac5ff35 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -17,9 +17,9 @@ # å¿»ç¶ æ <2544304...@qq.com>, 2020 # Runzhe Liang <18051080...@163.com>, 2020 # Feng Zi , 2021 -# Emma Peel, 2021 # ff98sha, 2021 # Scott Rhodes , 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -27,7 +27,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 16:21+CET\n" "PO-Revision-Date: 2018-10-02 22:41+\n" -"Last-Translator: Scott Rhodes , 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
commit 840eb87c75b512e78b77c2689bf7be7f2e5abb8e Author: Translation commit bot Date: Tue Apr 20 16:17:57 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+zh-CN.po | 12 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/contents+zh-CN.po b/contents+zh-CN.po index 322c30022d..c1193272e2 100644 --- a/contents+zh-CN.po +++ b/contents+zh-CN.po @@ -16,9 +16,9 @@ # walking , 2021 # Li Ma , 2021 # Cloud P , 2021 -# Emma Peel, 2021 # ff98sha, 2021 # Scott Rhodes , 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -26,7 +26,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-20 12:54+CET\n" "PO-Revision-Date: 2019-03-09 10:41+\n" -"Last-Translator: Scott Rhodes , 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Chinese (China) (https://www.transifex.com/otf/teams/1519/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -812,9 +812,7 @@ msgstr " è¿ä¸æ¥é 读" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) msgid "- [The Tor Project in the Media](https://www.torproject.org/press/)" -msgstr "" -"-[åªä½æ¥éä¸ç Tor 项ç®]\n" -"(https://www.torproject.org/press/)" +msgstr "-[åªä½æ¥éä¸ç Tor 项ç®](https://www.torproject.org/press/)" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body) @@ -828,9 +826,7 @@ msgstr "- [Tor é¡¹ç® è´¢å¡æ¥å](https://www.torproject.org/about/reports/)" msgid "" "- [The Tor Project Board Members and " "Staff](https://www.torproject.org/about/people/)" -msgstr "" -"-[Tor 项ç®çäºä¼æåä¸å·¥ä½äººå]\n" -"(https://www.torproject.org/about/people/)" +msgstr "-[Tor 项ç®çäºä¼æåä¸å·¥ä½äººå](https://www.torproject.org/about/people/)" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
commit 2ac5323a03dd78c1918c2bcace53f87484c72136 Author: Translation commit bot Date: Tue Apr 20 16:17:06 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+nl.po| 7 +++ contents+pt-BR.po | 18 +- contents+ro.po| 8 contents+sw.po| 6 +++--- contents+zh-CN.po | 4 ++-- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/contents+nl.po b/contents+nl.po index 78def61355..cefd30f677 100644 --- a/contents+nl.po +++ b/contents+nl.po @@ -1,7 +1,6 @@ # # Translators: # bacovane , 2018 -# Emma Peel, 2019 # Tonnes , 2019 # erinm, 2019 # Nathan Follens, 2019 @@ -10,6 +9,7 @@ # Barbara Vermeirsch , 2020 # Gus, 2021 # kwadronaut , 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 09:17+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: kwadronaut , 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -236,8 +236,7 @@ msgid "" msgstr "" "Standaard houdt Tor Browser geen browsegeschiedenis bij. Cookies zijn alleen" " geldig voor een enkele sessie (totdat Tor Browser wordt verlaten of een " -"[Nieuwe Identiteit] (/managing-identiteiten/#nieuwe-identiteit) wordt " -"aangevraagd)." +"[Nieuwe Identiteit](/managing-identities/#new-identity) wordt aangevraagd)." #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.body) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 6440d0565f..aca8eec429 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -3,11 +3,11 @@ # Alexei Gonçalves de Oliveira , 2019 # Cy Belle , 2019 # C. E., 2019 +# Communia , 2019 # blueboy, 2019 # Anderson Santos , 2019 # m tk, 2019 # Caio Volpato , 2019 -# Communia , 2020 # Shayane Alcantara , 2020 # André Marcelo Alvarenga , 2021 # Gus, 2021 @@ -15,8 +15,8 @@ # Igor Bk 13, 2021 # erinm, 2021 # Antonela D , 2021 -# Emma Peel, 2021 # Daniel, 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -24,7 +24,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 09:17+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: Daniel, 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2423,11 +2423,11 @@ msgid "" "websites to run scripts in \"Standard\" mode." msgstr "" "As pessoas que necessitam de um alto grau de segurança em sua navegação web " -"devem ajustar o [NÃvel de Segurança] a \"Mais Seguro\" (que desabilita o " -"Javascript em todos os websites sem HTTPS) ou \"O Mais Seguro\". Entretanto," -" o JavaScript desabilitado impede a exibição correta de diversos websites. " -"Por isso, a configuração padrão do Tor Browser permite que todos os " -"websites executem scripts no modo \"Padrão\"." +"devem ajustar o [NÃvel de Segurança](../security-settings/) a \"Mais " +"Seguro\" (que desabilita o Javascript em todos os websites sem HTTPS) ou \"O" +" Mais Seguro\". Entretanto, o JavaScript desabilitado impede a exibição " +"correta de diversos websites. Por isso, a configuração padrão do Tor " +"Browser permite que todos os websites executem scripts no modo \"Padrão\"." #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body) @@ -3576,7 +3576,7 @@ msgid "" "portal](https://support.torproject.org/tormobile/tormobile-6/) to know if " "you need both Tor Browser for Android and Orbot or either one." msgstr "" -"Confira [nosso portal de suporte] (https://support.torproject.org/pt-; +"Confira [nosso portal de suporte](https://support.torproject.org/pt-; "BR/tormobile/tormobile-6/) para saber se você precisa do Tor Browser para " "Android e Orbot ou de um deles." diff --git a/contents+ro.po b/contents+ro.po index 0c8fda5a92..410dd56172 100644 --- a/contents+ro.po +++ b/contents+ro.po @@ -4,9 +4,9 @@ # A C , 2019 # erinm, 2019 # Iasmina Gruicin , 2019 -# Emma Peel, 2020 # Gus, 2021 # eduard pintilie , 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-02 09:17+CET\n" "PO-Revision-Date: 2018-11-14 12:31+\n" -"Last-Translator: eduard pintilie , 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2401,8 +2401,8 @@ msgid "" "websites to run scripts in \"Standard\" mode." msgstr "" "Utilizatorii care vor un grad ridicat de securitate în navigarea lor web ar " -"trebui sÄ configureze [Nivelul de securitate] (../security-settings/) al Tor" -" Browser pe âSaferâ
[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
commit c9adcc96d8b664b319f60001b331a5f1053a8e33 Author: Translation commit bot Date: Tue Apr 20 16:15:14 2021 + https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot --- contents+pt-BR.po | 32 contents+ro.po| 12 ++-- contents+zh-CN.po | 8 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 6f8d44e860..9c6a65263c 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -11,7 +11,6 @@ # blueboy, 2021 # Gus, 2021 # Henrique Pinto, 2021 -# Emma Peel, 2021 # Reurison Silva Rodrigues, 2021 # Transifex Bot <>, 2021 # Eduardo Addad de Oliveira , 2021 @@ -30,6 +29,7 @@ # Joeffison Silvério de Andrade , 2021 # IDRASSI Mounir , 2021 # ÄorÄe MaruÅ¡iÄ , 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -37,7 +37,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-07 12:21+CET\n" "PO-Revision-Date: 2019-12-11 10:50+\n" -"Last-Translator: ÄorÄe MaruÅ¡iÄ , 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2173,8 +2173,8 @@ msgid "" "getting to know other relay operators. Make sure to check out the archives!" msgstr "" "Se você tiver problemas ao configurar o seu retransmissor, você pode " -"perguntar suas questões na [lista pública de correio de retransmissores Tor]" -" (https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays). A " +"perguntar suas questões na [lista pública de correio de retransmissores " +"Tor](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays). A " "lista é um ótima fonta para perguntas (e respostas) de questões e para " "conhecer outros operadores de retransmissores. Certifique-se de conferir " "nossos arquivos!" @@ -2644,15 +2644,15 @@ msgid "" "* [Design Kit: The Human-Centered Design Toolkit](https://www.ideo.com/post; "/design-kit)" msgstr "" -"* [Kit de Design: O Kit de Ferramenta para o Design Centrado no Ser Humano] " -"(https://www.ideo.com/post/design-kit)" +"* [Kit de Design: O Kit de Ferramenta para o Design Centrado no Ser " +"Humano](https://www.ideo.com/post/design-kit)" #: https//community.torproject.org/user-research/guidelines/ #: (content/user-research/guidelines/contents+en.lrpage.body) msgid "" "* [Simply Secure Knowledge Base](https://simplysecure.org/knowledge-base/)" msgstr "" -"* [Base de Conhecimento Simply Secure] (https://simplysecure.org/knowledge-; +"* [Base de Conhecimento Simply Secure](https://simplysecure.org/knowledge-; "base/)" #: https//community.torproject.org/user-research/guidelines/ @@ -3431,8 +3431,8 @@ msgid "" "training?\"](https://sec.eff.org/articles/right-person-to-train)." msgstr "" "à por isso que recomendamos este material do Security Education Companion da" -" EFF, [\"Sou a pessoa certa para dar este treinamento?\"] " -"(https://sec.eff.org/articles/right-person-to-train)." +" EFF, [\"Sou a pessoa certa para dar este " +"treinamento?\"](https://sec.eff.org/articles/right-person-to-train)." #: https//community.torproject.org/training/best-practices/ #: (content/training/best-practices/contents+en.lrpage.body) @@ -7155,7 +7155,7 @@ msgid "" "[UptimeRobot](https://uptimerobot.com/) is one of these services that allow " "you to monitor TCP listeners on arbitrary ports." msgstr "" -"[UptimeRobot] (https://uptimerobot.com/) é um desses serviços que permite " +"[UptimeRobot](https://uptimerobot.com/) é um desses serviços que permite " "monitorar ouvintes TCP em portas arbitrárias." #: https//community.torproject.org/relay/setup/post-install/ @@ -7229,7 +7229,7 @@ msgid "" "There are many tools for monitoring this kind of data, [munin](http://munin-; "monitoring.org/) is one of them and is relatively easy to setup." msgstr "" -"Existem muitas ferramentas para monitorar este tipo de dados, [munin] (http" +"Existem muitas ferramentas para monitorar este tipo de dados, [munin](http" "://munin-monitoring.org/) é uma delas e é relativamente fácil de configurar." #: https//community.torproject.org/relay/setup/post-install/ @@ -7335,8 +7335,8 @@ msgid "" "output](https://humdi.net/vnstat/cgidemo/)." msgstr "" "Você também pode usá-lo para gerar imagens PNG mostrando gráficos de " -"tráfego. [documentação vnstat] (https://humdi.net/vnstat/) e [demo output] " -"(https://humdi.net/vnstat/cgidemo/)." +"tráfego. [documentação vnstat](https://humdi.net/vnstat/) e [demo " +"output](https://humdi.net/vnstat/cgidemo/)." #: https//community.torproject.org/relay/setup/exit/ #: (content/relay-operations/technical-setup/exit/contents+en.lrpage.title) @@ -7968,8 +7968,8 @@ msgid "" "source](https://gitlab.com/yawning/obfs4#installation)." msgstr "" "Nota 1: Se você estiver executando uma plataforma que não está listada
[tor-commits] [translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
commit bab46c5d5dd1e3279b23a55273bb1a4c63e2d3f2 Author: Translation commit bot Date: Tue Apr 20 15:45:12 2021 + https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot --- contents+de.po | 67 +- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/contents+de.po b/contents+de.po index cf22f00289..9f1e26 100644 --- a/contents+de.po +++ b/contents+de.po @@ -11,7 +11,6 @@ # Stephen, 2021 # kalei, 2021 # Gus, 2021 -# Emma Peel, 2021 # Vincent Breitmoser , 2021 # Transifex Bot <>, 2021 # c8faa9c4b9d81319c5c2fd62ae3a9956, 2021 @@ -24,6 +23,7 @@ # Marcel Haring , 2021 # IDRASSI Mounir , 2021 # Curtis Baltimore , 2021 +# Emma Peel, 2021 # msgid "" msgstr "" @@ -31,7 +31,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-07 12:21+CET\n" "PO-Revision-Date: 2019-12-11 10:50+\n" -"Last-Translator: Curtis Baltimore , 2021\n" +"Last-Translator: Emma Peel, 2021\n" "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -9667,9 +9667,9 @@ msgid "" "[exitmap](http://www.cs.kau.se/philwint/spoiled_onions/) and " "[sybilhunter](https://gitweb.torproject.org/user/phw/sybilhunter.git/)." msgstr "" -"Ja. Für unsere automatische Problemerkennung siehe [Exitmap] " -"(http://www.cs.kau.se/philwint/spoiled_onions/) und [Sybilhunter] " -"(https://gitweb.torproject.org/user/phw/sybilhunter.git/)." +"Ja. Für unsere automatische Problemerkennung siehe " +"[Exitmap](http://www.cs.kau.se/philwint/spoiled_onions/) und " +"[Sybilhunter](https://gitweb.torproject.org/user/phw/sybilhunter.git/)." #: https//community.torproject.org/relay/community-resources/bad-relays/ #: (content/relay-operations/community-resources/bad-relays/contents+en.lrpage.body) @@ -10215,8 +10215,8 @@ msgid "" " at [ExoneraTor](https://exonerator.torproject.org/). Point to that website " "in your reply to the complaint." msgstr "" -"Du kannst unter [ExoneraTor] (https://exonerator.torproject.org/) nachsehen," -" ob eine IP-Adresse zu einem bestimmten Zeitpunkt als Exit-Relay aufgeführt " +"Du kannst unter [ExoneraTor](https://exonerator.torproject.org/) nachsehen, " +"ob eine IP-Adresse zu einem bestimmten Zeitpunkt als Exit-Relay aufgeführt " "war. Weise in deiner Antwort auf die Beschwerde auf diese Website hin." #: https//community.torproject.org/relay/community-resources/tor-exit-guidelines/ @@ -10299,7 +10299,7 @@ msgid "" "/tor-relays) and we will try to explain the process to you." msgstr "" "Wenn du Fragen zum Prozess hast, schreib bitte eine E-Mail an die [Tor-" -"Relays-Mailingliste] (https://lists.torproject.org/cgi-bin/mailman/listinfo; +"Relays-Mailingliste](https://lists.torproject.org/cgi-bin/mailman/listinfo; "/tor-relays) und wir werden versuchen, dir den Prozess zu erklären." #: https//community.torproject.org/relay/community-resources/tor-exit-guidelines/ @@ -10340,10 +10340,10 @@ msgid "" " is an alternative to the default exit policy. It allows many Internet " "services while still blocking the majority of TCP ports." msgstr "" -"Die [reduzierte Exit-Richtlinie] " -"(https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy) ist " -"eine Alternative zur standardmäÃigen Exit-Richtlinie. Sie erlaubt viele " -"Internetdienste, blockiert aber immer noch die Mehrzahl der TCP-Anschlüsse." +"Die [reduzierte Exit-" +"Richtlinie](https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy)" +" ist eine Alternative zur standardmäÃigen Exit-Richtlinie. Sie erlaubt viele" +" Internetdienste, blockiert aber immer noch die Mehrzahl der TCP-Anschlüsse." #: https//community.torproject.org/relay/community-resources/tor-exit-guidelines/ #: (content/relay-operations/community-resources/tor-exit-guidelines/contents+en.lrpage.body) @@ -10355,7 +10355,7 @@ msgid "" msgstr "" "Dadurch wird die Wahrscheinlichkeit, dass ein Bittorrent-Benutzer deinen " "Knoten auswählt, drastisch reduziert und somit die Anzahl der [DMCA-" -"Beschwerden] (/relay/community-resources/eff-tor-legal-faq/tor-dmca-" +"Beschwerden](/relay/community-resources/eff-tor-legal-faq/tor-dmca-" "response/), die du erhältst, reduziert oder sogar eliminiert." #: https//community.torproject.org/relay/community-resources/tor-exit-guidelines/ @@ -10381,8 +10381,8 @@ msgid "" "relays](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays)." msgstr "" "Bitte lies alle technischen Details, bevor du anfängst. Wenn du Fragen hast " -"oder Hilfe benötigst, kontaktiere uns bitte unter [Tor-Relays] " -"(https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays)." +"oder Hilfe benötigst, kontaktiere uns bitte unter [Tor-" +"Relays](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays)." #: https//community.torproject.org/relay/community-resources/tor-exit-guidelines/ #:
[tor-commits] [tor-browser-build/master] Bug 40270: Improve process to generate gradle-dependencies-list.txt
commit 8ba33c11bb66c6ef775155542bba3f24706a71d1
Author: Nicolas Vigier
Date: Tue Apr 13 17:59:12 2021 +0200
Bug 40270: Improve process to generate gradle-dependencies-list.txt
---
Makefile | 9 +
projects/android-components/build | 4 ++-
projects/android-components/config | 14 ++--
projects/application-services/build| 4 ++-
projects/application-services/config | 23 +++--
{tools => projects/common}/gen_gradle_deps_file.sh | 0
.../how-to-create-gradle-dependencies-list.txt | 40 --
projects/fenix/build | 7 +++-
projects/fenix/config | 33 --
9 files changed, 105 insertions(+), 29 deletions(-)
diff --git a/Makefile b/Makefile
index 35e8834..1d16fa4 100644
--- a/Makefile
+++ b/Makefile
@@ -219,6 +219,15 @@ create_glean_deps_tarball: submodule-update
create_glean_deps_tarball-with_torsocks: submodule-update
$(rbm) build glean --step create_glean_deps_tarball --target alpha
--target torbrowser-android-armv7 --target with_torsocks
+get_gradle_dependencies_list-fenix: submodule-update
+ $(rbm) build fenix --step get_gradle_dependencies_list --target nightly
--target torbrowser-android-armv7
+
+get_gradle_dependencies_list-application-services: submodule-update
+ $(rbm) build application-services --step get_gradle_dependencies_list
--target nightly --target torbrowser-android-armv7
+
+get_gradle_dependencies_list-android-components: submodule-update
+ $(rbm) build android-components --step get_gradle_dependencies_list
--target nightly --target torbrowser-android-armv7
+
submodule-update:
git submodule update --init
diff --git a/projects/android-components/build
b/projects/android-components/build
index 896ba3a..e14b803 100644
--- a/projects/android-components/build
+++ b/projects/android-components/build
@@ -41,7 +41,9 @@ patch -p1 < $rootdir/git.patch
# XXX: fetching deps for `assembleGeckoBeta -x lint` by using that same
target
# results in some missing dependencies for yet unknown reasons. Thus, we use
# `assemble` instead for now.
- gradle --debug --no-daemon assemble
+ gradle --debug --no-daemon assemble > gradle.log 2>&1 || ( cat gradle.log;
exit 1 )
+ $rootdir/gen_gradle_deps_file.sh gradle.log
+ mv gradle-dependencies-list.txt '[% dest_dir _ "/" _ c("filename") %]'
[% ELSE %]
# Prepare Glean dependencies for offline build
tar -xf $rootdir/[% c('input_files_by_name/glean') %]
diff --git a/projects/android-components/config
b/projects/android-components/config
index e3068b6..5284ce7 100644
--- a/projects/android-components/config
+++ b/projects/android-components/config
@@ -14,9 +14,6 @@ var:
use_container: 1
# This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 22
- # Switch to make it easier to grab all dependencies during a dry-run.
- # Note: Use the commit before support for new GeckoView interfaces gets
added.
- fetch_gradle_dependencies: 0
gradle_version: 6.6.1
glean_parser: 2.2.0
@@ -27,10 +24,13 @@ targets:
input_files:
- project: container-image
+pkg_type: build
- name: '[% c("var/compiler") %]'
project: '[% c("var/compiler") %]'
+pkg_type: build
- project: gradle
name: gradle
+pkg_type: build
- name: geckoview
project: geckoview
pkg_type: merge_aars
@@ -52,6 +52,8 @@ input_files:
name: glean
sha256sum: 24ceaaadaf155445e8ad135173d894e05c0745b41ab5fee150f9548550acf2a6
enable: '[% !c("var/fetch_gradle_dependencies") %]'
+ - filename: gen_gradle_deps_file.sh
+enable: '[% c("var/fetch_gradle_dependencies") %]'
steps:
list_toolchain_updates:
@@ -75,3 +77,9 @@ steps:
- name: glean
project: glean
pkg_type: src
+
+ get_gradle_dependencies_list:
+filename: 'gradle-dependencies-list-[% c("var/android_components_version")
%].txt'
+get_gradle_dependencies_list: '[% INCLUDE build %]'
+var:
+ fetch_gradle_dependencies: 1
diff --git a/projects/application-services/build
b/projects/application-services/build
index b7461bf..40001cd 100644
--- a/projects/application-services/build
+++ b/projects/application-services/build
@@ -83,7 +83,9 @@ patch -p1 < $rootdir/target.patch
[% IF c('var/fetch_gradle_dependencies') %]
# XXX: `assemble` is still not enough to see all fetched dependencies via
# Gradle's --debug. See: tor-browser-build#40056.
- gradle --debug --no-daemon assemble
+ gradle --debug --no-daemon assemble > gradle.log 2>&1 || ( cat gradle.log;
exit 1 )
+ $rootdir/gen_gradle_deps_file.sh gradle.log
+ mv gradle-dependencies-list.txt '[% dest_dir _ "/" _ c("filename") %]'
[% ELSE %]
# Prepare Glean dependencies for offline build
tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2
diff --git
[tor-commits] [tor-browser-build/master] Bug 40259: Update components for mozilla88-based Fenix (fenix part)
commit 9513cacd1f7b3b3c1c58c69a9246db8a12d0f2d0
Author: Nicolas Vigier
Date: Mon Apr 12 16:07:51 2021 +0200
Bug 40259: Update components for mozilla88-based Fenix (fenix part)
---
projects/fenix/build| 9 +-
projects/fenix/config | 16 +-
projects/fenix/gradle-dependencies-list.txt | 533 ++--
projects/fenix/mavenLocal.patch | 31 +-
4 files changed, 301 insertions(+), 288 deletions(-)
diff --git a/projects/fenix/build b/projects/fenix/build
index c2f6f32..b118cdc 100644
--- a/projects/fenix/build
+++ b/projects/fenix/build
@@ -42,7 +42,7 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service')
%]/* app/
# XXX We need the build variant in lower case. Do something smarter here.
v=[% c("variant") %]
[% IF c("var/fetch_gradle_dependencies") %]
- $GRADLE_HOME/gradle/bin/gradle --debug --no-daemon app:assemble[%
c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,}
+ $GRADLE_HOME/gradle/bin/gradle --debug --no-daemon app:assemble[%
c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,}
-PdisableOptimization
[% ELSE %]
# Add our localized strings
[% FOREACH lang = c('var/locales_mobile');
@@ -52,7 +52,7 @@ v=[% c("variant") %]
[% END %]
# Prepare Glean dependencies for offline build
- tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2
+ tar -xf $rootdir/[% c('input_files_by_name/glean') %]
# We need to set `LC_ALL` and `LANG` to something that is not ASCII as
encoding
# otherwise `click` barfs. See: https://click.palletsprojects.com/python3/
export LC_ALL=C.UTF-8
@@ -67,7 +67,10 @@ v=[% c("variant") %]
fi
version_name='[% c("var/torbrowser_version") %] ([% c("var/fenix_version")
%]-[% c("variant") %])'
- $GRADLE_HOME/gradle/bin/gradle --offline --no-daemon
-PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[%
c('variant') %] app:assembleAndroidTest -x lint -PtestBuildType=${v,}
+ # We need -PdisableOptimization for building tests. See:
+ #
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/40259#note_2732325
+ $GRADLE_HOME/gradle/bin/gradle --offline --no-daemon
-PversionName="$version_name" -Dmaven.repo.local=$gradle_repo app:assemble[%
c('variant') %] -x lint -PtestBuildType=${v,}
+ $GRADLE_HOME/gradle/bin/gradle --offline --no-daemon
-PversionName="$version_name" -Dmaven.repo.local=$gradle_repo
app:assembleAndroidTest -x lint -PtestBuildType=${v,} -PdisableOptimization
cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %]
cp app/build/outputs/apk/androidTest/${v,}/app-${v,}-androidTest.apk
$distdir/[% project %]
diff --git a/projects/fenix/config b/projects/fenix/config
index f0b7e12..46cbc1e 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -8,17 +8,18 @@ gpg_keyring: torbutton.gpg
variant: Beta
var:
- fenix_version: 87.0.0
+ fenix_version: 88.0.0b4
torbrowser_branch: 10.5
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: 23
+ gradle_dependencies_version: 24
# Switch to make it easier to grab all dependencies during a dry-run.
# Note: Use the commit that integrates Tor.
fetch_gradle_dependencies: 0
gradle_version: 6.5.1
+ glean_parser: 2.2.0
targets:
nightly:
@@ -52,8 +53,9 @@ input_files:
name: gradle-dependencies
enable: '[% !c("var/fetch_gradle_dependencies") %]'
exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
- - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[%
c('var/glean_parser') %].tar.bz2
-sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2
+ - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[%
c('var/glean_parser') %].tar.xz
+name: glean
+sha256sum: 24ceaaadaf155445e8ad135173d894e05c0745b41ab5fee150f9548550acf2a6
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- filename: mavenLocal.patch
enable: '[% !c("var/fetch_gradle_dependencies") %]'
@@ -64,9 +66,9 @@ input_files:
steps:
list_toolchain_updates:
-git_url: https://github.com/mozilla-mobile/fenix.git
-git_hash: v88.0.0-beta.4
-tag_gpg_id: 0
+#git_url: https://github.com/mozilla-mobile/fenix.git
+#git_hash: v88.0.0-beta.4
+#tag_gpg_id: 0
input_files: []
var:
container:
diff --git a/projects/fenix/gradle-dependencies-list.txt
b/projects/fenix/gradle-dependencies-list.txt
index 53aa56b..1cbaeee 100644
--- a/projects/fenix/gradle-dependencies-list.txt
+++ b/projects/fenix/gradle-dependencies-list.txt
@@ -22,8 +22,8 @@
f7eab60c57addd94bb06275832fe7600611beaaae1a1ec597c231956faf96c8b | https://dl.go
48167eeedc8da79c4d29deaf0d0cd9b5d8fedcae01f1a6efb3f28f08e8982f71 |
[tor-commits] [tor-browser-build/master] Bug 40259: Update components for mozilla88-based Fenix (android-components part)
commit f7a8d9aab47742856451fa41f27f3339d252b33a
Author: Nicolas Vigier
Date: Fri Apr 9 18:47:52 2021 +0200
Bug 40259: Update components for mozilla88-based Fenix (android-components
part)
---
projects/android-components/build | 2 +-
projects/android-components/config | 16 +-
.../gradle-dependencies-list.txt | 186 ++---
projects/android-components/mavenLocal.patch | 29 ++--
4 files changed, 119 insertions(+), 114 deletions(-)
diff --git a/projects/android-components/build
b/projects/android-components/build
index 279525c..896ba3a 100644
--- a/projects/android-components/build
+++ b/projects/android-components/build
@@ -44,7 +44,7 @@ patch -p1 < $rootdir/git.patch
gradle --debug --no-daemon assemble
[% ELSE %]
# Prepare Glean dependencies for offline build
- tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2
+ tar -xf $rootdir/[% c('input_files_by_name/glean') %]
# We need to set `LC_ALL` and `LANG` to something that is not ASCII as
encoding
# otherwise `click` barfs. See: https://click.palletsprojects.com/python3/
export LC_ALL=C.UTF-8
diff --git a/projects/android-components/config
b/projects/android-components/config
index a9942e3..e3068b6 100644
--- a/projects/android-components/config
+++ b/projects/android-components/config
@@ -8,16 +8,17 @@ gpg_keyring: torbutton.gpg
variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]'
var:
- android_components_version: 73.0.11
+ android_components_version: 74.0.6
torbrowser_branch: 10.5
container:
use_container: 1
# This should be updated when the list of gradle dependencies is changed.
- gradle_dependencies_version: 21
+ gradle_dependencies_version: 22
# Switch to make it easier to grab all dependencies during a dry-run.
# Note: Use the commit before support for new GeckoView interfaces gets
added.
fetch_gradle_dependencies: 0
gradle_version: 6.6.1
+ glean_parser: 2.2.0
targets:
nightly:
@@ -47,15 +48,16 @@ input_files:
- filename: git.patch
- filename: mavenLocal.patch
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- - URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[%
c('var/glean_parser') %].tar.bz2
-sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2
+ - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[%
c('var/glean_parser') %].tar.xz
+name: glean
+sha256sum: 24ceaaadaf155445e8ad135173d894e05c0745b41ab5fee150f9548550acf2a6
enable: '[% !c("var/fetch_gradle_dependencies") %]'
steps:
list_toolchain_updates:
-git_url: https://github.com/mozilla-mobile/android-components.git
-git_hash: v74.0.6
-tag_gpg_id: 0
+#git_url: https://github.com/mozilla-mobile/android-components.git
+#git_hash: v74.0.6
+#tag_gpg_id: 0
var:
container:
use_container: 0
diff --git a/projects/android-components/gradle-dependencies-list.txt
b/projects/android-components/gradle-dependencies-list.txt
index 1debd7f..ab3da10 100644
--- a/projects/android-components/gradle-dependencies-list.txt
+++ b/projects/android-components/gradle-dependencies-list.txt
@@ -29,8 +29,8 @@
f7eab60c57addd94bb06275832fe7600611beaaae1a1ec597c231956faf96c8b | https://dl.go
48167eeedc8da79c4d29deaf0d0cd9b5d8fedcae01f1a6efb3f28f08e8982f71 |
https://dl.google.com/dl/android/maven2/androidx/asynclayoutinflater/asynclayoutinflater/1.0.0/asynclayoutinflater-1.0.0.pom
270c7b7d99942d5ec1dd88594e4648feb33d8e31d8c3c2ab2321d49d9abdfc1f |
https://dl.google.com/dl/android/maven2/androidx/biometric/biometric/1.1.0/biometric-1.1.0.aar
aeb69e76988f43b06c84fca25efab2e418bb98b5aabcd03fa7913bd3ed1bcaa9 |
https://dl.google.com/dl/android/maven2/androidx/biometric/biometric/1.1.0/biometric-1.1.0.pom
-8a28c71070271b6f802f5a285ab9ae5b424e60a4f4bb4e73c0c6f53c1375506d |
https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.2.0/browser-1.2.0.aar
-0125474b4ff9dd64d9ebaa003ba0a19f782354e4490e270fc9fb2a39b33c1115 |
https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.2.0/browser-1.2.0.pom
+e740b1beeac82303415d68bee9d5c1f259716f560a829ca07c7ce97e60850e1b |
https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.3.0/browser-1.3.0.aar
+d82e1df52624a1fe2757055258e225ccc3aebc3f5a3d523414d7f1bbc80055f8 |
https://dl.google.com/dl/android/maven2/androidx/browser/browser/1.3.0/browser-1.3.0.pom
1193c04c22a3d6b5946dae9f4e8c59d6adde6a71b6bd5d87fb99d82dda1afec7 |
https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/cardview-1.0.0.aar
e64ef4e08b58358fe27b599e6fe80a1b153db014c644beee630ab271061c3e6c |
https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/cardview-1.0.0.pom
a7913a5275ad68e555d2612ebe8c14c367b153e14ca48a1872a64899020e54ef |
https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.0/collection-1.0.0.pom
[tor-commits] [tor-browser-build/master] Bug 40259: Update components for mozilla88-based Fenix (application-services part)
commit df6e7666adeb9170a89564d1b9f6bfce62e2798f
Author: Nicolas Vigier
Date: Wed Apr 7 12:54:00 2021 +0200
Bug 40259: Update components for mozilla88-based Fenix
(application-services part)
---
projects/application-services/build| 1 -
projects/application-services/config | 14 ++--
.../application-services/update-cargo-lock.patch | 93 +---
.../application-services/viaduct-workaround.patch | 12 +--
.../application-services/viaduct-workaround2.patch | 98 --
5 files changed, 52 insertions(+), 166 deletions(-)
diff --git a/projects/application-services/build
b/projects/application-services/build
index 4d1ab07..b7461bf 100644
--- a/projects/application-services/build
+++ b/projects/application-services/build
@@ -52,7 +52,6 @@ EOF
patch -p1 < $rootdir/update-cargo-lock.patch
cd components/external/nimbus-sdk
patch -p1 < $rootdir/viaduct-workaround.patch
-patch -p1 < $rootdir/viaduct-workaround2.patch
cd ../../../
# Move NSS and SQLCipher to the right place
diff --git a/projects/application-services/config
b/projects/application-services/config
index 0cf0dd2..588d573 100644
--- a/projects/application-services/config
+++ b/projects/application-services/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-version: 71.0.0
-git_hash: 1ee6b32f3ee569036fdf1015cf7ffc01ded2860f
+version: 74.0.1
+git_hash: ad7b64fa03eeeb00815125e635d1fb8809befd40
git_url: https://github.com/mozilla/application-services
git_submodule: 1
@@ -11,7 +11,7 @@ var:
# This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 5
# This should be updated when the list of rust dependencies is changed.
- rust_vendor_version: 4
+ rust_vendor_version: 5
# Switch to make it easier to grab all dependencies during a dry-run.
fetch_gradle_dependencies: 0
gradle_version: 6.5
@@ -70,21 +70,19 @@ input_files:
enable: '[% !c("var/fetch_gradle_dependencies") %]'
# `cargo vendor vendor -s components/external/nimbus-sdk/nimbus/Cargo.toml`
# in the `application-services` directory has vendored the sources,
- # after applying update-cargo-lock.patch, viaduct-workaround.patch and
- # viaduct-workaround2.patch
+ # after applying update-cargo-lock.patch and viaduct-workaround.patch
- URL:
https://people.torproject.org/~boklm/mirrors/sources/application-services-vendor-[%
c('var/rust_vendor_version') %].tar.bz2
-sha256sum: 500d0fa471c8ad2037c4bbe648e716e77da1ff1fc5678542b144cd257a34abbf
+sha256sum: 5f1c9e1bc0db283e88516bd1d78187145bacbf4aeb72972ac09875c1147d2215
- filename: no-git.patch
- filename: mavenLocal.patch
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- filename: target.patch
- filename: viaduct-workaround.patch
- - filename: viaduct-workaround2.patch
- filename: update-cargo-lock.patch
steps:
list_toolchain_updates:
-git_hash: 'v74.0.1'
+#git_hash: 'v74.0.1'
input_files: []
var:
container:
diff --git a/projects/application-services/update-cargo-lock.patch
b/projects/application-services/update-cargo-lock.patch
index 5e28cca..3a42019 100644
--- a/projects/application-services/update-cargo-lock.patch
+++ b/projects/application-services/update-cargo-lock.patch
@@ -1,14 +1,14 @@
-From cdcce5ffd9e49d4648dd6b23a6dfbc8011352883 Mon Sep 17 00:00:00 2001
+From 3d6b82d24bcf05b26c69702f6dcb1a0ac91c13a1 Mon Sep 17 00:00:00 2001
From: Georg Koppen
Date: Fri, 27 Nov 2020 09:55:49 +
Subject: [PATCH] update cargo.lock
---
- Cargo.lock | 390 +
- 1 file changed, 273 insertions(+), 117 deletions(-)
+ Cargo.lock | 384 +
+ 1 file changed, 267 insertions(+), 117 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
-index 813c475c..20b6e4d0 100644
+index 69d2dae0..2c1a3aa3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -86,9 +86,9 @@ checksum =
"23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
@@ -176,7 +176,7 @@ index 813c475c..20b6e4d0 100644
[[package]]
name = "cpuid-bool"
-@@ -548,7 +577,7 @@ source =
"registry+https://github.com/rust-lang/crates.io-index;
+@@ -559,7 +588,7 @@ source =
"registry+https://github.com/rust-lang/crates.io-index;
checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
dependencies = [
"cfg-if 1.0.0",
@@ -185,7 +185,7 @@ index 813c475c..20b6e4d0 100644
]
[[package]]
-@@ -559,18 +588,18 @@ checksum =
"94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+@@ -570,18 +599,18 @@ checksum =
"94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-epoch",
@@ -208,7 +208,7 @@ index 813c475c..20b6e4d0 100644
"lazy_static",
"memoffset",
"scopeguard",
-@@ -578,26 +607,20 @@ dependencies
[tor-commits] [tor-browser-build/master] Bug 40272: Add script to generate glean depencies tarballs
commit 4d562a83c40e4579250dc3ef60d54601bc31
Author: Nicolas Vigier
Date: Fri Apr 9 17:28:55 2021 +0200
Bug 40272: Add script to generate glean depencies tarballs
---
Makefile | 6
projects/common/how-to-update-glean-parser.txt | 30 +++---
projects/glean/config | 44 ++
3 files changed, 62 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
index 96600e2..35e8834 100644
--- a/Makefile
+++ b/Makefile
@@ -213,6 +213,12 @@ list_toolchain_updates-application-services:
submodule-update
list_toolchain_updates-geckoview: submodule-update
$(rbm) build geckoview --step list_toolchain_updates --target nightly
--target torbrowser-android-armv7
+create_glean_deps_tarball: submodule-update
+$(rbm)build glean --step create_glean_deps_tarball --target alpha
--target torbrowser-android-armv7
+
+create_glean_deps_tarball-with_torsocks: submodule-update
+ $(rbm) build glean --step create_glean_deps_tarball --target alpha
--target torbrowser-android-armv7 --target with_torsocks
+
submodule-update:
git submodule update --init
diff --git a/projects/common/how-to-update-glean-parser.txt
b/projects/common/how-to-update-glean-parser.txt
index a125f5f..625049e 100644
--- a/projects/common/how-to-update-glean-parser.txt
+++ b/projects/common/how-to-update-glean-parser.txt
@@ -3,42 +3,36 @@ distribute Glean dependencies beforehand.[1]
There are three steps involved in the process:
1) Finding out the `glean_parser` version
- 2) Downloading and verifying the dependencies
- 3) Bundling the dependencies up and pushing them to the sources mirror
+ 2) Downloading and verifying the dependencies, and creating the tarball
+ 3) Pushing it to the sources mirror
1)
-The `glean_parser` version is available in glean-core/python/setup.py in the
-Glean code repositoroy.[2] So, make sure which Glean version your
-`android-components` tag is using (`mozilla_glean` in
-buildSrc/src/main/java/Dependencies.kt has it) and then track `glean_parser`
-down in the respective Glean tag.
+Running `make list_toolchain_updates-android-components` should tell
+you which version of `glean_parser` is needed.
2)
-Create a directory `glean-wheels` and change into it. Then download packages
for
-`glean_parser` and its dependencies using
+Update `steps/create_glean_deps_tarball/version` in `projects/glean/config`
+to the version from step 1 above.
-`python3 -m pip download glean_parser==$glean_parser`
+Run this command to generate the tarball:
-($glean_parser being the version from step 1 above and Python 3 needs to be
3.6;
-ideally, we take the artifact we built and will use during the build later on
as
-well.)
+ make create_glean_deps_tarball
There is no really good way (yet) to verify that `pip` gave us actually what we
wanted. We can download `glean_parser` and its dependencies using a different
network path, though, e.g. by using `torsocks`. Comparing the results of both
downloads should yield the exact same binaries.
-3)
+If you want to use torsocks, you can use this command:
-Update the `glean_parser` version in `rbm.conf, tar `glean-wheels` up and
-compress it:
+ make create_glean_deps_tarball-with_torsocks
-`tar cfj glean-wheels-$glean_parser.tar.bz2 glean-wheels`
+3)
Upload the compressed tarball to the sources mirror and update the SHA-256 sum
of
-it in the respective projects.
+it as well as the `glean_parser` version in the respective projects.
[1] See: https://bugzilla.mozilla.org/show_bug.cgi?id=1651662 for details.
[2] https://github.com/mozilla/glean
diff --git a/projects/glean/config b/projects/glean/config
index 45bc43b..6fd6ce2 100644
--- a/projects/glean/config
+++ b/projects/glean/config
@@ -7,3 +7,47 @@ version: '[% pc(c("origin_project"), "var/glean_version", {
step => "list_toolch
src: |
#!/bin/bash
mv -f [% project %]-[% c('version') %].tar.gz [% dest_dir %]/[%
c('filename') %]
+
+steps:
+ create_glean_deps_tarball:
+git_url: ''
+version: 2.2.0
+filename: 'glean-wheels-[% c("version") %].tar.xz'
+build_log: '-'
+var:
+ container:
+use_container: 1
+create_glean_deps_tarball: |
+ #!/bin/bash
+ [% c("var/set_default_env") -%]
+ [% pc('python', 'var/setup', { python_tarfile =>
c('input_files_by_name/python') }) %]
+ mkdir glean-wheels
+ cd glean-wheels
+ [% IF c("var/use_torsocks") %]torsocks [% END%]python3 -m pip download
glean_parser==[% c("version") %]
+ cd ..
+ [% c('tar', {
+ tar_src => [ 'glean-wheels' ],
+ tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename'),
+ }) %]
+ cd '[% dest_dir %]'
+ sha256sum [% c('filename') %]
+ echo 'The file is ready to be uploaded:'
+ echo ' scp -p out/glean/[% c("filename") %]
people.torproject.org:public_html/mirrors/sources/'
+input_files:
+ -
[tor-commits] [tor-browser-build/master] Bug 25934: Disable building of rust docs
commit 9c5cba82e6e580c942068822d398bd380cc27dbc
Author: Nicolas Vigier
Date: Mon Mar 22 13:51:22 2021 +0100
Bug 25934: Disable building of rust docs
---
projects/rust/build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/rust/build b/projects/rust/build
index 31e1070..9609758 100644
--- a/projects/rust/build
+++ b/projects/rust/build
@@ -60,7 +60,7 @@ cd /var/tmp/build/rustc-[% c('version') %]-src
mkdir build
cd build
-../configure --prefix=$distdir [% c("var/configure_opt") %]
+../configure --prefix=$distdir --disable-docs --disable-compiler-docs [%
c("var/configure_opt") %]
make -j[% c("buildconf/num_procs") %]
make install
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 34108: Add scripts to check for needed toolchain updates
commit 9186eefe65db7fb8e63c6979e286ee302061c076
Author: Nicolas Vigier
Date: Mon Apr 5 13:15:17 2021 +0200
Bug 34108: Add scripts to check for needed toolchain updates
Checking toolchain updates can be done with the following commands:
make list_toolchain_updates-geckoview
make list_toolchain_updates-application-services
make list_toolchain_updates-android-components
make list_toolchain_updates-fenix
---
Makefile | 12 ++
projects/android-components/config | 20 ++
.../list_toolchain_updates_checks | 85 +
projects/android-toolchain/config | 3 +-
projects/application-services/config | 7 +
.../list_toolchain_updates_checks | 97 ++
projects/common/list_toolchain_updates | 38
projects/fenix/config | 7 +
projects/fenix/list_toolchain_updates_checks | 73
projects/geckoview/config | 5 +
projects/geckoview/list_toolchain_updates_checks | 202 +
projects/glean/config | 9 +
projects/llvm-project/config | 2 +-
rbm.conf | 3 +
14 files changed, 561 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index eedb27a..96600e2 100644
--- a/Makefile
+++ b/Makefile
@@ -201,6 +201,18 @@ dmg2mar-alpha: submodule-update
tools/update-responses/download_missing_versions alpha
CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1
tools/update-responses/gen_incrementals alpha
+list_toolchain_updates-fenix: submodule-update
+ $(rbm) build fenix --step list_toolchain_updates --target nightly
--target torbrowser-android-armv7
+
+list_toolchain_updates-android-components: submodule-update
+ $(rbm) build android-components --step list_toolchain_updates --target
nightly --target torbrowser-android-armv7
+
+list_toolchain_updates-application-services: submodule-update
+ $(rbm) build application-services --step list_toolchain_updates
--target nightly --target torbrowser-android-armv7
+
+list_toolchain_updates-geckoview: submodule-update
+ $(rbm) build geckoview --step list_toolchain_updates --target nightly
--target torbrowser-android-armv7
+
submodule-update:
git submodule update --init
diff --git a/projects/android-components/config
b/projects/android-components/config
index b3dee3a..216a818 100644
--- a/projects/android-components/config
+++ b/projects/android-components/config
@@ -50,3 +50,23 @@ input_files:
- URL: https://people.torproject.org/~gk/mirrors/sources/glean-parser-[%
c('var/glean_parser') %].tar.bz2
sha256sum: 19dbdd4958022a1a638e0217489ab722fe7d4f588f1978a4ae162f93e75694c2
enable: '[% !c("var/fetch_gradle_dependencies") %]'
+
+steps:
+ list_toolchain_updates:
+var:
+ container:
+use_container: 0
+ get_glean_version: |
+#!/bin/bash
+read -d '' p << 'EOF' || true
+if (m/const\\sval\\smozilla_glean\\s=\\s"([^"]+)"/) {
+ print $1;
+ exit;
+}
+EOF
+perl -ne "$p" < buildSrc/src/main/java/Dependencies.kt
+ glean_version: '[% exec(c("var/get_glean_version")) %]'
+input_files:
+ - name: glean
+project: glean
+pkg_type: src
diff --git a/projects/android-components/list_toolchain_updates_checks
b/projects/android-components/list_toolchain_updates_checks
new file mode 100644
index 000..a46afb4
--- /dev/null
+++ b/projects/android-components/list_toolchain_updates_checks
@@ -0,0 +1,85 @@
+#!/bin/bash
+
+# compileSdkVersion
+read -d '' p << 'EOF' || true
+if (m/compileSdkVersion:\\s+(.*)$/) {
+ print $1;
+ exit;
+}
+EOF
+needed=$(cat .config.yml | perl -ne "$p")
+current=30
+check_update_needed compileSdkVersion "$needed" "$current"
+
+
+# targetSdkVersion
+read -d '' p << 'EOF' || true
+if (m/targetSdkVersion:\\s+(.*)$/) {
+ print $1;
+ exit;
+}
+EOF
+needed=$(cat .config.yml | perl -ne "$p")
+current=30
+check_update_needed targetSdkVersion "$needed" "$current"
+
+
+# minSdkVersion
+read -d '' p << 'EOF' || true
+if (m/minSdkVersion:\\s+(.*)$/) {
+ print $1;
+ exit;
+}
+EOF
+needed=$(cat .config.yml | perl -ne "$p")
+current=21
+check_update_needed minSdkVersion "$needed" "$current"
+
+
+# application-services
+read -d '' p << 'EOF' || true
+if (m/const\\sval\\smozilla_appservices\\s=\\s"([^"]+)"/) {
+ print $1;
+ exit;
+}
+EOF
+needed=$(cat buildSrc/src/main/java/Dependencies.kt | perl -ne "$p")
+current='[% pc("application-services", "version") %]'
+check_update_needed application-services "$needed" "$current"
+
+
+# glean_parser
+read -d '' p << 'EOF' || true
+if (m/^\\s*"glean_parser==([^"]+)",/) {
+ print $1;
+ exit;
+}
+EOF
+tar xf $rootdir/[% c('input_files_by_name/glean') %]
+needed=$(cat glean-[%
[tor-commits] [tor-browser-build/master] Bug 40251: Fix indentation in projects/android-toolchain/build
commit 6be6549c1a41b7afe5da583be8e3cb0fa2c5faae
Author: Nicolas Vigier
Date: Tue Mar 23 15:41:19 2021 +0100
Bug 40251: Fix indentation in projects/android-toolchain/build
---
projects/android-toolchain/build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build
index cd6caec..e352b67 100644
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -20,7 +20,7 @@ unzip -qq [% c("input_files_by_name/android_ndk_compiler")%]
-d $NDK_HOME
# so we only have to take care of one. See: #33557 (comment 2674649).
cd $NDK_HOME/android-ndk-r[% c("var/android_ndk_version") %][%
c("var/android_ndk_revision") %]/toolchains/llvm/prebuilt/linux-x86_64/bin
for f in `ls arm-linux-androideabi-*`; do
-ln -s $f ${f//arm-linux-androideabi/armv7a-linux-androideabi}
+ ln -s $f ${f//arm-linux-androideabi/armv7a-linux-androideabi}
done
# Tool Archives
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 40266: Make the list of components updates for switch to mozilla88-based Fenix
commit 6dcdc7431e46f63f3f7265741906a0e71ad45660 Author: Nicolas Vigier Date: Mon Apr 5 13:46:10 2021 +0200 Bug 40266: Make the list of components updates for switch to mozilla88-based Fenix --- projects/android-components/config | 3 +++ projects/application-services/config | 1 + projects/fenix/config| 3 +++ projects/geckoview/config| 4 4 files changed, 11 insertions(+) diff --git a/projects/android-components/config b/projects/android-components/config index 216a818..a9942e3 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -53,6 +53,9 @@ input_files: steps: list_toolchain_updates: +git_url: https://github.com/mozilla-mobile/android-components.git +git_hash: v74.0.6 +tag_gpg_id: 0 var: container: use_container: 0 diff --git a/projects/application-services/config b/projects/application-services/config index 6a80ffc..0cf0dd2 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -84,6 +84,7 @@ input_files: steps: list_toolchain_updates: +git_hash: 'v74.0.1' input_files: [] var: container: diff --git a/projects/fenix/config b/projects/fenix/config index a3e95b0..f0b7e12 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -64,6 +64,9 @@ input_files: steps: list_toolchain_updates: +git_url: https://github.com/mozilla-mobile/fenix.git +git_hash: v88.0.0-beta.4 +tag_gpg_id: 0 input_files: [] var: container: diff --git a/projects/geckoview/config b/projects/geckoview/config index 0d90a27..c6286db 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -138,6 +138,10 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: +git_url: https://github.com/mozilla/gecko-dev.git +# 88.0b8 +git_hash: 43ab49774f70a5c70b2cd69a2b2a8bc0a3be20bf +tag_gpg_id: 0 input_files: [] var: container: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-build/master] Bug 40259: Update components for mozilla88-based Fenix (GeckoView part)
commit d735870c9767110a84f723ae8371316e01a569da
Author: Matthew Finkel
Date: Mon Apr 5 21:38:47 2021 +
Bug 40259: Update components for mozilla88-based Fenix (GeckoView part)
Now Geckoview uses build-tools 30.0.2, so this patch updates
android-toolchain, as well.
---
projects/android-toolchain/build | 38
projects/android-toolchain/config| 36 +++---
projects/geckoview/config| 8 ++---
projects/geckoview/list_toolchain_updates_checks | 2 +-
4 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build
index e352b67..29d79e5 100644
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -3,9 +3,9 @@
export PROJECT_PATH=/var/tmp/dist/[% project %]
export SDK_HOME=$PROJECT_PATH/android-sdk-linux
export NDK_HOME=$PROJECT_PATH/android-ndk
-android_release_dir=android-10
-android_release_dir_old=android-9
-android_release_dir_new=android-11
+android_release_dir_9=android-9
+android_release_dir_10=android-10
+android_release_dir_11=android-11
# Make directories
mkdir -p $NDK_HOME $SDK_HOME
@@ -26,27 +26,27 @@ done
# Tool Archives
cd $SDK_HOME
unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME
-mkdir -p build-tools/[% c("version") %]
-mv $android_release_dir/* build-tools/[% c("version") %]
+mkdir -p build-tools/[% c("var/version_30") %]
+mv $android_release_dir_11/* build-tools/[% c("var/version_30") %]
+
+unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME
+mkdir -p platforms/android-[% c("var/android_api_level") %]
+mv $android_release_dir_11/* platforms/android-[% c("var/android_api_level") %]
# Apart from GeckoView all other projects do still need build-tools 28.0.3 as
# they are using the Gradle plugin 3.2.1 - 3.6.0 without specifying
# `buildToolsVersion`.
-unzip -qq $HOME/[% c("input_files_by_name/build_tools_old") %] -d $SDK_HOME
-mkdir -p build-tools/[% c("version_old") %]
-mv $android_release_dir_old/* build-tools/[% c("version_old") %]
-
-unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME
-mkdir -p platforms/android-[% c("var/android_api_level") %]
-mv $android_release_dir/* platforms/android-[% c("var/android_api_level") %]
+unzip -qq $HOME/[% c("input_files_by_name/build_tools_28") %] -d $SDK_HOME
+mkdir -p build-tools/[% c("var/version_28") %]
+mv $android_release_dir_9/* build-tools/[% c("var/version_28") %]
-unzip -qq $HOME/[% c("input_files_by_name/build_tools_new") %] -d $SDK_HOME
-mkdir -p build-tools/[% c("var/android_api_level_new") %]
-mv $android_release_dir_new/* build-tools/[% c("var/android_api_level_new") %]
+unzip -qq $HOME/[% c("input_files_by_name/build_tools_29") %] -d $SDK_HOME
+mkdir -p build-tools/[% c("var/version_29") %]
+mv $android_release_dir_10/* build-tools/[% c("var/version_29") %]
-unzip -qq $HOME/[% c("input_files_by_name/platform_new") %] -d $SDK_HOME
-mkdir -p platforms/android-[% c("var/android_api_level_new") %]
-mv $android_release_dir_new/* platforms/android-[%
c("var/android_api_level_new") %]
+unzip -qq $HOME/[% c("input_files_by_name/platform_29") %] -d $SDK_HOME
+mkdir -p platforms/android-[% c("var/android_api_level_29") %]
+mv $android_release_dir_10/* platforms/android-[%
c("var/android_api_level_29") %]
unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME
@@ -56,7 +56,7 @@ mkdir emulator
cp tools/emulator emulator/
# Cleanup
-rm -fR $android_release_dir $android_release_dir_old $android_release_dir_new
+rm -fR $android_release_dir_9 $android_release_dir_10 $android_release_dir_11
# Archive dist directory
cd /var/tmp/dist
diff --git a/projects/android-toolchain/config
b/projects/android-toolchain/config
index 6d78b37..5196528 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -1,8 +1,10 @@
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-version: 29.0.2
-version_old: 28.0.3
+version: '[% c("var/version_28") %]+[% c("var/version_29") %]+[%
c("var/version_30") %]'
var:
+ version_30: 30.0.2
+ version_29: 29.0.2
+ version_28: 28.0.3
container:
use_container: 1
deps:
@@ -25,36 +27,36 @@ var:
export
PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin
mkdir -p "$GRADLE_HOME"
google_repo: https://dl.google.com/android/repository
- android_api_level: 29
- android_platform_revision: 04
- android_api_level_new: 30
- android_platform_revision_new: 03
+ android_api_level: 30
+ android_platform_revision: 03
+ android_api_level_29: 29
+ android_platform_revision_29: 04
android_ndk_version: 21
android_ndk_revision: d
sdk_tools_version: 4333796
input_files:
- project: container-image
- - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version")
[tor-commits] [torspec/master] Fold proposal 328 into dir-spec.txt
commit 60a830e5cbaa1185c3f9ebac855e10c6d9b8ef0d
Author: George Kadianakis
Date: Mon Apr 19 18:09:11 2021 +0300
Fold proposal 328 into dir-spec.txt
---
dir-spec.txt | 66
1 file changed, 66 insertions(+)
diff --git a/dir-spec.txt b/dir-spec.txt
index 685834f..2399ed4 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -635,6 +635,34 @@
"ipv6-policy" line is equivalent to "ipv6-policy reject
1-65535".
+"overload-general" SP version SP -MM-DD HH:MM:SS NL
+
+ [At most once.]
+
+ Indicates that a relay has reached an "overloaded state" which can be
+ one or many of the following load metrics:
+
+ - Any OOM invocation due to memory pressure
+ - Any ntor onionskins are dropped
+ - TCP port exhaustion
+ - DNS timeout reached
+
+ The timestamp is when at least one metrics was detected. It should always
+ be at the hour and thus, as an example, "2020-01-10 13:00:00" is an
+ expected timestamp. Because this is a binary state, if the line is
+ present, we consider that it was hit at the very least once somewhere
+ between the provided timestamp and the "published" timestamp of the
+ document which is when the document was generated.
+
+ The overload-general line should remain in place for 72 hours since last
+ triggered. If the limits are reached again in this period, the timestamp
+ is updated, and this 72 hour period restarts.
+
+ The 'version' field is set to '1' for now.
+
+ (Introduced in tor-0.4.6.1-alpha, but moved from extra-info to general
+ descriptor in tor-0.4.6.2-alpha)
+
"router-sig-ed25519" SP Signature NL
[Exactly once.]
@@ -1323,6 +1351,44 @@
- The maximum number of timers that this relay scheduled for
padding in the previous NSEC interval
+"overload-ratelimits" SP version SP -MM-DD SP HH:MM:SS
+ SP rate-limit SP burst-limit
+ SP read-overload-count SP write-overload-count NL
+[At most once.]
+
+Indicates that a bandwidth limit was exhausted for this relay.
+
+ The "rate-limit" and "burst-limit" are the raw values from the
+ BandwidthRate and BandwidthBurst found in the torrc
configuration file.
+
+ The "{read|write}-overload-count" are the counts of how many
times the
+ reported limits of burst/rate were exhausted and thus the
maximum
+ between the read and write count occurances. To make the
counter more
+ meaningful and to avoid multiple connections saturating the
counter
+ when a relay is overloaded, we only increment it once a minute.
+
+ The 'version' field is set to '1' for now.
+
+(Introduced in tor-0.4.6.1-alpha)
+
+"overload-fd-exhausted" SP version -MM-DD HH:MM:SS NL
+[At most once.]
+
+Indicates that a file descriptor exhaustion was experienced by this
+relay.
+
+The timestamp indicates that the maximum was reached between the
+timestamp and the "published" timestamp of the document.
+
+This overload field should remain in place for 72 hours since last
+triggered. If the limits are reached again in this period, the
+timestamp is updated, and this 72 hour period restarts.
+
+The 'version' field is set to '1' for the initial implementation which
+detects fd exhaustion only when a socket open fails.
+
+(Introduced in tor-0.4.6.1-alpha)
+
"router-sig-ed25519"
[As in router descriptors]
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] fixup! Fold proposal 328 into dir-spec.txt
commit a5c03d0716e1a83eeb6af0ed6b5ec7703438a326
Author: George Kadianakis
Date: Tue Apr 20 12:10:42 2021 +0300
fixup! Fold proposal 328 into dir-spec.txt
---
dir-spec.txt | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dir-spec.txt b/dir-spec.txt
index 2399ed4..39a0318 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -1358,16 +1358,16 @@
Indicates that a bandwidth limit was exhausted for this relay.
- The "rate-limit" and "burst-limit" are the raw values from the
- BandwidthRate and BandwidthBurst found in the torrc
configuration file.
+The "rate-limit" and "burst-limit" are the raw values from the
+BandwidthRate and BandwidthBurst found in the torrc configuration file.
- The "{read|write}-overload-count" are the counts of how many
times the
- reported limits of burst/rate were exhausted and thus the
maximum
- between the read and write count occurances. To make the
counter more
- meaningful and to avoid multiple connections saturating the
counter
- when a relay is overloaded, we only increment it once a minute.
+The "{read|write}-overload-count" are the counts of how many times the
+reported limits of burst/rate were exhausted and thus the maximum
+between the read and write count occurances. To make the counter more
+meaningful and to avoid multiple connections saturating the counter
+when a relay is overloaded, we only increment it once a minute.
- The 'version' field is set to '1' for now.
+The 'version' field is set to '1' for now.
(Introduced in tor-0.4.6.1-alpha)
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
commit 487ed7947e13a7f3074559893ff14cff2833a45a Author: Translation commit bot Date: Tue Apr 20 13:17:43 2021 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd --- zh-HK/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh-HK/torbutton.dtd b/zh-HK/torbutton.dtd index c671b8ec28..dd588c8839 100644 --- a/zh-HK/torbutton.dtd +++ b/zh-HK/torbutton.dtd @@ -37,7 +37,7 @@ - + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
commit c3ea3a7ffe1db21911b413c3e566520db52f5aa0 Author: Translation commit bot Date: Tue Apr 20 13:16:53 2021 + https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- fr.po| 6 +++--- zh_HK.po | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fr.po b/fr.po index cf2318b3c6..34125e2a32 100644 --- a/fr.po +++ b/fr.po @@ -41,8 +41,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-19 08:20+0200\n" -"PO-Revision-Date: 2021-04-19 09:15+\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-04-20 13:12+\n" +"Last-Translator: AO \n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -228,7 +228,7 @@ msgstr "Une erreur est survenue pendant la mise à niveau de la clé de signa #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:304 msgid "Error while downloading the signing key" -msgstr "" +msgstr "Erreur de téléchargement de la clé de signature" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:316 msgid "Error while updating the signing key" diff --git a/zh_HK.po b/zh_HK.po index 15bbd05ca8..4e4f2f59a7 100644 --- a/zh_HK.po +++ b/zh_HK.po @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-04-19 08:20+0200\n" -"PO-Revision-Date: 2021-04-19 09:15+\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-04-20 13:08+\n" +"Last-Translator: Adawcs\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
