- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.4.0esr-13.0-1-build2
by ma1 (＠ma1) 23 Oct '23

23 Oct '23

ma1 pushed new tag base-browser-115.4.0esr-13.0-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.4.0esr-13.0-1-build2
by ma1 (＠ma1) 23 Oct '23

23 Oct '23

ma1 pushed new tag tor-browser-115.4.0esr-13.0-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.4.0esr-13.5-1] 7 commits: Bug 1738426 - Ignoring status 206 and vary header checking for opaque response...
by richard (＠richard) 23 Oct '23

23 Oct '23

richard pushed to branch mullvad-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 985138e0 by Eden Chuang at 2023-10-23T12:36:44+00:00 Bug 1738426 - Ignoring status 206 and vary header checking for opaque response in Cache API. r=asuth Differential Revision: https://phabricator.services.mozilla.com/D186431 - - - - - 8cb3e494 by edgul at 2023-10-23T12:36:44+00:00 Bug 1802057 - Block the following characters from use in the cookie name in the cookie string: 0x3B (semi-colon), 0x3D (equals), and 0x7F (del) r=dveditz,cookie-reviewers Differential Revision: https://phabricator.services.mozilla.com/D182373 - - - - - e116477a by Kelsey Gilbert at 2023-10-23T12:36:44+00:00 Bug 1819497 - Don't race on static bool for initialization. r=gfx-reviewers,aosmond We could do non-racy static init here (e.g. with a static initializer self-calling-closure), but there doesn't seem to be a strong reason for this. Let's just use a switch and get robustness from -Werror=switch. Differential Revision: https://phabricator.services.mozilla.com/D188054 - - - - - 97184c52 by Mark Banner at 2023-10-23T12:36:45+00:00 Bug 1845752. r=ckerschb Differential Revision: https://phabricator.services.mozilla.com/D186676 - - - - - e4ad60d6 by Bob Owen at 2023-10-23T12:36:45+00:00 Bug 1850072: Initialize RecordedDrawTargetCreation::mHasExistingData. r=jrmuizel This also specializes ElementStreamFormat for bool. Differential Revision: https://phabricator.services.mozilla.com/D187794 - - - - - bc7d6958 by Malte Juergens at 2023-10-23T12:36:46+00:00 Bug 1850200 - Add delay to HTTPS-Only "Continue to HTTPS Site" button r=freddyb Differential Revision: https://phabricator.services.mozilla.com/D187887 - - - - - 32638567 by Andreas Pehrson at 2023-10-23T12:36:46+00:00 Bug 1851803 - Introduce SourceMediaTrack::mDirectDisabledMode. r=karlt Similar to MediaTrack::mDisabledMode, but this is for uses on the SourceMediaTrack producer thread. It is still signaled via a control message from the control thread to maintain order of operations, and is protected by the SourceMediaTrack mutex. Differential Revision: https://phabricator.services.mozilla.com/D187554 - - - - - 18 changed files: - dom/cache/TypeUtils.cpp - dom/canvas/WebGLContextExtensions.cpp - dom/media/MediaTrackGraph.cpp - dom/media/MediaTrackGraph.h - gfx/2d/RecordedEventImpl.h - gfx/2d/RecordingTypes.h - netwerk/cookie/CookieCommons.cpp - testing/web-platform/meta/cookies/name/name-ctl.html.ini - − testing/web-platform/meta/service-workers/cache-storage/cache-put.https.any.js.ini - toolkit/components/httpsonlyerror/content/errorpage.html - toolkit/components/httpsonlyerror/content/errorpage.js - toolkit/components/search/OpenSearchEngine.sys.mjs - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/search/SearchUtils.sys.mjs - toolkit/components/search/tests/xpcshell/data/iconsRedirect.sjs - toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js - toolkit/components/search/tests/xpcshell/test_webextensions_install.js - toolkit/modules/RemotePageAccessManager.sys.mjs Changes: ===================================== dom/cache/TypeUtils.cpp ===================================== @@ -184,7 +184,7 @@ void TypeUtils::ToCacheResponseWithoutBody(CacheResponse& aOut, aOut.statusText() = aIn.GetUnfilteredStatusText(); RefPtr<InternalHeaders> headers = aIn.UnfilteredHeaders(); MOZ_DIAGNOSTIC_ASSERT(headers); - if (HasVaryStar(headers)) { + if (aIn.Type() != ResponseType::Opaque && HasVaryStar(headers)) { aRv.ThrowTypeError("Invalid Response object with a 'Vary: *' header."); return; } ===================================== dom/canvas/WebGLContextExtensions.cpp ===================================== @@ -17,15 +17,10 @@ namespace mozilla { const char* GetExtensionName(const WebGLExtensionID ext) { - static EnumeratedArray<WebGLExtensionID, WebGLExtensionID::Max, const char*> - sExtensionNamesEnumeratedArray; - static bool initialized = false; - - if (!initialized) { - initialized = true; - + switch (ext) { #define WEBGL_EXTENSION_IDENTIFIER(x) \ - sExtensionNamesEnumeratedArray[WebGLExtensionID::x] = #x; + case WebGLExtensionID::x: \ + return #x; WEBGL_EXTENSION_IDENTIFIER(ANGLE_instanced_arrays) WEBGL_EXTENSION_IDENTIFIER(EXT_blend_minmax) @@ -67,9 +62,11 @@ const char* GetExtensionName(const WebGLExtensionID ext) { WEBGL_EXTENSION_IDENTIFIER(WEBGL_provoking_vertex) #undef WEBGL_EXTENSION_IDENTIFIER - } - return sExtensionNamesEnumeratedArray[ext]; + case WebGLExtensionID::Max: + break; + } + MOZ_CRASH("bad WebGLExtensionID"); } // ---------------------------- ===================================== dom/media/MediaTrackGraph.cpp ===================================== @@ -145,6 +145,27 @@ class GraphKey final { nsTHashMap<nsGenericHashKey<GraphKey>, MediaTrackGraphImpl*> gGraphs; } // anonymous namespace +static void ApplyTrackDisabling(DisabledTrackMode aDisabledMode, + MediaSegment* aSegment, + MediaSegment* aRawSegment) { + if (aDisabledMode == DisabledTrackMode::ENABLED) { + return; + } + if (aDisabledMode == DisabledTrackMode::SILENCE_BLACK) { + aSegment->ReplaceWithDisabled(); + if (aRawSegment) { + aRawSegment->ReplaceWithDisabled(); + } + } else if (aDisabledMode == DisabledTrackMode::SILENCE_FREEZE) { + aSegment->ReplaceWithNull(); + if (aRawSegment) { + aRawSegment->ReplaceWithNull(); + } + } else { + MOZ_CRASH("Unsupported mode"); + } +} + MediaTrackGraphImpl::~MediaTrackGraphImpl() { MOZ_ASSERT(mTracks.IsEmpty() && mSuspendedTracks.IsEmpty(), "All tracks should have been destroyed by messages from the main " @@ -2421,6 +2442,7 @@ RefPtr<GenericPromise> MediaTrack::RemoveListener( void MediaTrack::AddDirectListenerImpl( already_AddRefed<DirectMediaTrackListener> aListener) { + MOZ_ASSERT(mGraph->OnGraphThread()); // Base implementation, for tracks that don't support direct track listeners. RefPtr<DirectMediaTrackListener> listener = aListener; listener->NotifyDirectListenerInstalled( @@ -2503,6 +2525,7 @@ void MediaTrack::RunAfterPendingUpdates( } void MediaTrack::SetDisabledTrackModeImpl(DisabledTrackMode aMode) { + MOZ_ASSERT(mGraph->OnGraphThread()); MOZ_DIAGNOSTIC_ASSERT( aMode == DisabledTrackMode::ENABLED || mDisabledMode == DisabledTrackMode::ENABLED, @@ -2531,22 +2554,8 @@ void MediaTrack::SetDisabledTrackMode(DisabledTrackMode aMode) { void MediaTrack::ApplyTrackDisabling(MediaSegment* aSegment, MediaSegment* aRawSegment) { - if (mDisabledMode == DisabledTrackMode::ENABLED) { - return; - } - if (mDisabledMode == DisabledTrackMode::SILENCE_BLACK) { - aSegment->ReplaceWithDisabled(); - if (aRawSegment) { - aRawSegment->ReplaceWithDisabled(); - } - } else if (mDisabledMode == DisabledTrackMode::SILENCE_FREEZE) { - aSegment->ReplaceWithNull(); - if (aRawSegment) { - aRawSegment->ReplaceWithNull(); - } - } else { - MOZ_CRASH("Unsupported mode"); - } + MOZ_ASSERT(mGraph->OnGraphThread()); + mozilla::ApplyTrackDisabling(mDisabledMode, aSegment, aRawSegment); } void MediaTrack::AddMainThreadListener( @@ -2866,7 +2875,7 @@ TrackTime SourceMediaTrack::AppendData(MediaSegment* aSegment, // Apply track disabling before notifying any consumers directly // or inserting into the graph - ApplyTrackDisabling(aSegment, aRawSegment); + mozilla::ApplyTrackDisabling(mDirectDisabledMode, aSegment, aRawSegment); ResampleAudioToGraphSampleRate(aSegment); @@ -2910,6 +2919,7 @@ void SourceMediaTrack::NotifyDirectConsumers(MediaSegment* aSegment) { void SourceMediaTrack::AddDirectListenerImpl( already_AddRefed<DirectMediaTrackListener> aListener) { + MOZ_ASSERT(mGraph->OnGraphThread()); MutexAutoLock lock(mMutex); RefPtr<DirectMediaTrackListener> listener = aListener; @@ -2979,6 +2989,7 @@ void SourceMediaTrack::AddDirectListenerImpl( void SourceMediaTrack::RemoveDirectListenerImpl( DirectMediaTrackListener* aListener) { + mGraph->AssertOnGraphThreadOrNotRunning(); MutexAutoLock lock(mMutex); for (int32_t i = mDirectTrackListeners.Length() - 1; i >= 0; --i) { const RefPtr<DirectMediaTrackListener>& l = mDirectTrackListeners[i]; @@ -3008,17 +3019,20 @@ void SourceMediaTrack::End() { } void SourceMediaTrack::SetDisabledTrackModeImpl(DisabledTrackMode aMode) { + MOZ_ASSERT(mGraph->OnGraphThread()); { MutexAutoLock lock(mMutex); + const DisabledTrackMode oldMode = mDirectDisabledMode; + const bool oldEnabled = oldMode == DisabledTrackMode::ENABLED; + const bool enabled = aMode == DisabledTrackMode::ENABLED; + mDirectDisabledMode = aMode; for (const auto& l : mDirectTrackListeners) { - DisabledTrackMode oldMode = mDisabledMode; - bool oldEnabled = oldMode == DisabledTrackMode::ENABLED; - if (!oldEnabled && aMode == DisabledTrackMode::ENABLED) { + if (!oldEnabled && enabled) { LOG(LogLevel::Debug, ("%p: SourceMediaTrack %p setting " "direct listener enabled", GraphImpl(), this)); l->DecreaseDisabled(oldMode); - } else if (oldEnabled && aMode != DisabledTrackMode::ENABLED) { + } else if (oldEnabled && !enabled) { LOG(LogLevel::Debug, ("%p: SourceMediaTrack %p setting " "direct listener disabled", GraphImpl(), this)); ===================================== dom/media/MediaTrackGraph.h ===================================== @@ -652,18 +652,8 @@ class SourceMediaTrack : public MediaTrack { */ void End(); - // Overriding allows us to hold the mMutex lock while changing the track - // enable status void SetDisabledTrackModeImpl(DisabledTrackMode aMode) override; - // Overriding allows us to ensure mMutex is locked while changing the track - // enable status - void ApplyTrackDisabling(MediaSegment* aSegment, - MediaSegment* aRawSegment = nullptr) override { - mMutex.AssertCurrentThreadOwns(); - MediaTrack::ApplyTrackDisabling(aSegment, aRawSegment); - } - uint32_t NumberOfChannels() const override; void RemoveAllDirectListenersImpl() override; @@ -742,6 +732,11 @@ class SourceMediaTrack : public MediaTrack { // protected by mMutex float mVolume MOZ_GUARDED_BY(mMutex) = 1.0; UniquePtr<TrackData> mUpdateTrack MOZ_GUARDED_BY(mMutex); + // This track's associated disabled mode for uses on the producing thread. + // It can either by disabled by frames being replaced by black, or by + // retaining the previous frame. + DisabledTrackMode mDirectDisabledMode MOZ_GUARDED_BY(mMutex) = + DisabledTrackMode::ENABLED; nsTArray<RefPtr<DirectMediaTrackListener>> mDirectTrackListeners MOZ_GUARDED_BY(mMutex); }; ===================================== gfx/2d/RecordedEventImpl.h ===================================== @@ -65,7 +65,7 @@ class RecordedDrawTargetCreation BackendType mBackendType; IntRect mRect; SurfaceFormat mFormat; - bool mHasExistingData; + bool mHasExistingData = false; RefPtr<SourceSurface> mExistingData; private: ===================================== gfx/2d/RecordingTypes.h ===================================== @@ -24,6 +24,28 @@ struct ElementStreamFormat { aStream.read(reinterpret_cast<char*>(&aElement), sizeof(T)); } }; +template <class S> +struct ElementStreamFormat<S, bool> { + static void Write(S& aStream, const bool& aElement) { + char boolChar = aElement ? '\x01' : '\x00'; + aStream.write(&boolChar, sizeof(boolChar)); + } + static void Read(S& aStream, bool& aElement) { + char boolChar; + aStream.read(&boolChar, sizeof(boolChar)); + switch (boolChar) { + case '\x00': + aElement = false; + break; + case '\x01': + aElement = true; + break; + default: + aStream.SetIsBad(); + break; + } + } +}; template <class S, class T> void WriteElement(S& aStream, const T& aElement) { ===================================== netwerk/cookie/CookieCommons.cpp ===================================== @@ -200,9 +200,9 @@ bool CookieCommons::CheckNameAndValueSize(const CookieStruct& aCookieData) { bool CookieCommons::CheckName(const CookieStruct& aCookieData) { const char illegalNameCharacters[] = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, - 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, - 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x00}; + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, + 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, + 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x3B, 0x3D, 0x7F, 0x00}; const auto* start = aCookieData.name().BeginReading(); const auto* end = aCookieData.name().EndReading(); ===================================== testing/web-platform/meta/cookies/name/name-ctl.html.ini ===================================== @@ -11,36 +11,6 @@ [Cookie with %xd in name is rejected (DOM).] expected: FAIL - [Cookie with %x7f in name is rejected (DOM).] - expected: FAIL - - [Cookie with %x0 in name is rejected or modified (HTTP).] - expected: FAIL - - [Cookie with %x1 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x2 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x3 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x4 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x5 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x6 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x7 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x8 in name is rejected (HTTP).] - expected: FAIL - [Cookie with %x9 in name is accepted (HTTP).] expected: FAIL ===================================== testing/web-platform/meta/service-workers/cache-storage/cache-put.https.any.js.ini deleted ===================================== @@ -1,26 +0,0 @@ -[cache-put.https.any.serviceworker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.sharedworker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.worker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL ===================================== toolkit/components/httpsonlyerror/content/errorpage.html ===================================== @@ -67,6 +67,7 @@ <button id="openInsecure" data-l10n-id="about-httpsonly-button-continue-to-site" + inert ></button> </div> <div class="suggestion-box" hidden> ===================================== toolkit/components/httpsonlyerror/content/errorpage.js ===================================== @@ -34,6 +34,11 @@ function initPage() { .getElementById("openInsecure") .addEventListener("click", onOpenInsecureButtonClick); + const delay = RPMGetIntPref("security.dialog_enable_delay", 1000); + setTimeout(() => { + document.getElementById("openInsecure").removeAttribute("inert"); + }, delay); + if (window.top == window) { document .getElementById("goBack") ===================================== toolkit/components/search/OpenSearchEngine.sys.mjs ===================================== @@ -144,7 +144,12 @@ export class OpenSearchEngine extends SearchEngine { lazy.logConsole.debug("_install: Downloading engine from:", loadURI.spec); - var chan = lazy.SearchUtils.makeChannel(loadURI); + var chan = lazy.SearchUtils.makeChannel( + loadURI, + // OpenSearchEngine is loading a definition file for a search engine, + // TYPE_DOCUMENT captures that load best + Ci.nsIContentPolicy.TYPE_DOCUMENT + ); if (this._engineToUpdate && chan instanceof Ci.nsIHttpChannel) { var lastModified = this._engineToUpdate.getAttr("updatelastmodified"); ===================================== toolkit/components/search/SearchEngine.sys.mjs ===================================== @@ -821,7 +821,10 @@ export class SearchEngine { this._hasPreferredIcon = isPreferred; }; - let chan = lazy.SearchUtils.makeChannel(uri); + let chan = lazy.SearchUtils.makeChannel( + uri, + Ci.nsIContentPolicy.TYPE_IMAGE + ); let listener = new lazy.SearchUtils.LoadListener( chan, /^image\//, ===================================== toolkit/components/search/SearchUtils.sys.mjs ===================================== @@ -248,19 +248,24 @@ export var SearchUtils = { * * @param {string|nsIURI} url * The URL string from which to create an nsIChannel. + * @param {nsIContentPolicy} contentPolicyType + * The type of document being loaded. * @returns {nsIChannel} * an nsIChannel object, or null if the url is invalid. */ - makeChannel(url) { + makeChannel(url, contentPolicyType) { + if (!contentPolicyType) { + throw new Error("makeChannel called with invalid content policy type"); + } try { let uri = typeof url == "string" ? Services.io.newURI(url) : url; return Services.io.newChannelFromURI( uri, null /* loadingNode */, - Services.scriptSecurityManager.getSystemPrincipal(), + Services.scriptSecurityManager.createNullPrincipal({}), null /* triggeringPrincipal */, Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL, - Ci.nsIContentPolicy.TYPE_OTHER + contentPolicyType ); } catch (ex) {} ===================================== toolkit/components/search/tests/xpcshell/data/iconsRedirect.sjs ===================================== @@ -10,7 +10,7 @@ function handleRequest(request, response) { response.setStatusLine("1.1", 302, "Moved"); if (request.queryString == "type=invalid") { response.setHeader("Content-Type", "image/png", false); - response.setHeader("Location", "engine.xml", false); + response.setHeader("Location", "/head_search.js", false); } else { response.setHeader("Content-Type", "text/html", false); response.setHeader("Location", "remoteIcon.ico", false); ===================================== toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js ===================================== @@ -12,9 +12,11 @@ add_task(async function setup() { }); add_task(async function test_installedresourceicon() { + // Attempts to load a resource:// url as an icon. let engine1 = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}opensearch/resourceicon.xml`, }); + // Attempts to load a chrome:// url as an icon. let engine2 = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}opensearch/chromeicon.xml`, }); @@ -32,12 +34,13 @@ add_task(async function test_installedhttpplace() { // The easiest way to test adding the icon is via a generated xml, otherwise // we have to somehow insert the address of the server into it. + // Attempts to load a non-image page into an image icon. let engine = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}data/engineMaker.sjs?` + JSON.stringify({ baseURL: gDataUrl, - image: "opensearch/resourceicon.xml", + image: "head_search.js", name: "invalidicon", method: "GET", }), ===================================== toolkit/components/search/tests/xpcshell/test_webextensions_install.js ===================================== @@ -5,6 +5,8 @@ const { promiseShutdownManager, promiseStartupManager } = AddonTestUtils; +let gBaseUrl; + async function getEngineNames() { let engines = await Services.search.getEngines(); return engines.map(engine => engine._name); @@ -13,6 +15,8 @@ async function getEngineNames() { add_task(async function setup() { let server = useHttpServer(); server.registerContentType("sjs", "sjs"); + gBaseUrl = `http://localhost:${server.identity.primaryPort}/`; + await SearchTestUtils.useTestEngines("test-extensions"); await promiseStartupManager(); @@ -132,7 +136,7 @@ add_task(async function test_load_favicon_invalid() { // User installs a new search engine let extension = await SearchTestUtils.installSearchExtension( { - favicon_url: `${gDataUrl}engine.xml`, + favicon_url: `${gBaseUrl}/head_search.js`, }, { skipUnload: true } ); ===================================== toolkit/modules/RemotePageAccessManager.sys.mjs ===================================== @@ -66,6 +66,7 @@ export let RemotePageAccessManager = { }, "about:httpsonlyerror": { RPMGetFormatURLPref: ["app.support.baseURL"], + RPMGetIntPref: ["security.dialog_enable_delay"], RPMSendAsyncMessage: ["goBack", "openInsecure"], RPMAddMessageListener: ["WWWReachable"], RPMTryPingSecureWWWLink: ["*"], View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/68… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/68… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.4.0esr-13.5-1] 7 commits: Bug 1738426 - Ignoring status 206 and vary header checking for opaque response...
by richard (＠richard) 23 Oct '23

23 Oct '23

richard pushed to branch base-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: b019f751 by Eden Chuang at 2023-10-23T12:34:34+00:00 Bug 1738426 - Ignoring status 206 and vary header checking for opaque response in Cache API. r=asuth Differential Revision: https://phabricator.services.mozilla.com/D186431 - - - - - 15e6ab9a by edgul at 2023-10-23T12:34:34+00:00 Bug 1802057 - Block the following characters from use in the cookie name in the cookie string: 0x3B (semi-colon), 0x3D (equals), and 0x7F (del) r=dveditz,cookie-reviewers Differential Revision: https://phabricator.services.mozilla.com/D182373 - - - - - 198e936f by Kelsey Gilbert at 2023-10-23T12:34:35+00:00 Bug 1819497 - Don't race on static bool for initialization. r=gfx-reviewers,aosmond We could do non-racy static init here (e.g. with a static initializer self-calling-closure), but there doesn't seem to be a strong reason for this. Let's just use a switch and get robustness from -Werror=switch. Differential Revision: https://phabricator.services.mozilla.com/D188054 - - - - - da8da0e5 by Mark Banner at 2023-10-23T12:34:35+00:00 Bug 1845752. r=ckerschb Differential Revision: https://phabricator.services.mozilla.com/D186676 - - - - - 1665929f by Bob Owen at 2023-10-23T12:34:35+00:00 Bug 1850072: Initialize RecordedDrawTargetCreation::mHasExistingData. r=jrmuizel This also specializes ElementStreamFormat for bool. Differential Revision: https://phabricator.services.mozilla.com/D187794 - - - - - 4528a947 by Malte Juergens at 2023-10-23T12:34:36+00:00 Bug 1850200 - Add delay to HTTPS-Only "Continue to HTTPS Site" button r=freddyb Differential Revision: https://phabricator.services.mozilla.com/D187887 - - - - - 251143c1 by Andreas Pehrson at 2023-10-23T12:34:36+00:00 Bug 1851803 - Introduce SourceMediaTrack::mDirectDisabledMode. r=karlt Similar to MediaTrack::mDisabledMode, but this is for uses on the SourceMediaTrack producer thread. It is still signaled via a control message from the control thread to maintain order of operations, and is protected by the SourceMediaTrack mutex. Differential Revision: https://phabricator.services.mozilla.com/D187554 - - - - - 18 changed files: - dom/cache/TypeUtils.cpp - dom/canvas/WebGLContextExtensions.cpp - dom/media/MediaTrackGraph.cpp - dom/media/MediaTrackGraph.h - gfx/2d/RecordedEventImpl.h - gfx/2d/RecordingTypes.h - netwerk/cookie/CookieCommons.cpp - testing/web-platform/meta/cookies/name/name-ctl.html.ini - − testing/web-platform/meta/service-workers/cache-storage/cache-put.https.any.js.ini - toolkit/components/httpsonlyerror/content/errorpage.html - toolkit/components/httpsonlyerror/content/errorpage.js - toolkit/components/search/OpenSearchEngine.sys.mjs - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/search/SearchUtils.sys.mjs - toolkit/components/search/tests/xpcshell/data/iconsRedirect.sjs - toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js - toolkit/components/search/tests/xpcshell/test_webextensions_install.js - toolkit/modules/RemotePageAccessManager.sys.mjs Changes: ===================================== dom/cache/TypeUtils.cpp ===================================== @@ -184,7 +184,7 @@ void TypeUtils::ToCacheResponseWithoutBody(CacheResponse& aOut, aOut.statusText() = aIn.GetUnfilteredStatusText(); RefPtr<InternalHeaders> headers = aIn.UnfilteredHeaders(); MOZ_DIAGNOSTIC_ASSERT(headers); - if (HasVaryStar(headers)) { + if (aIn.Type() != ResponseType::Opaque && HasVaryStar(headers)) { aRv.ThrowTypeError("Invalid Response object with a 'Vary: *' header."); return; } ===================================== dom/canvas/WebGLContextExtensions.cpp ===================================== @@ -17,15 +17,10 @@ namespace mozilla { const char* GetExtensionName(const WebGLExtensionID ext) { - static EnumeratedArray<WebGLExtensionID, WebGLExtensionID::Max, const char*> - sExtensionNamesEnumeratedArray; - static bool initialized = false; - - if (!initialized) { - initialized = true; - + switch (ext) { #define WEBGL_EXTENSION_IDENTIFIER(x) \ - sExtensionNamesEnumeratedArray[WebGLExtensionID::x] = #x; + case WebGLExtensionID::x: \ + return #x; WEBGL_EXTENSION_IDENTIFIER(ANGLE_instanced_arrays) WEBGL_EXTENSION_IDENTIFIER(EXT_blend_minmax) @@ -67,9 +62,11 @@ const char* GetExtensionName(const WebGLExtensionID ext) { WEBGL_EXTENSION_IDENTIFIER(WEBGL_provoking_vertex) #undef WEBGL_EXTENSION_IDENTIFIER - } - return sExtensionNamesEnumeratedArray[ext]; + case WebGLExtensionID::Max: + break; + } + MOZ_CRASH("bad WebGLExtensionID"); } // ---------------------------- ===================================== dom/media/MediaTrackGraph.cpp ===================================== @@ -145,6 +145,27 @@ class GraphKey final { nsTHashMap<nsGenericHashKey<GraphKey>, MediaTrackGraphImpl*> gGraphs; } // anonymous namespace +static void ApplyTrackDisabling(DisabledTrackMode aDisabledMode, + MediaSegment* aSegment, + MediaSegment* aRawSegment) { + if (aDisabledMode == DisabledTrackMode::ENABLED) { + return; + } + if (aDisabledMode == DisabledTrackMode::SILENCE_BLACK) { + aSegment->ReplaceWithDisabled(); + if (aRawSegment) { + aRawSegment->ReplaceWithDisabled(); + } + } else if (aDisabledMode == DisabledTrackMode::SILENCE_FREEZE) { + aSegment->ReplaceWithNull(); + if (aRawSegment) { + aRawSegment->ReplaceWithNull(); + } + } else { + MOZ_CRASH("Unsupported mode"); + } +} + MediaTrackGraphImpl::~MediaTrackGraphImpl() { MOZ_ASSERT(mTracks.IsEmpty() && mSuspendedTracks.IsEmpty(), "All tracks should have been destroyed by messages from the main " @@ -2421,6 +2442,7 @@ RefPtr<GenericPromise> MediaTrack::RemoveListener( void MediaTrack::AddDirectListenerImpl( already_AddRefed<DirectMediaTrackListener> aListener) { + MOZ_ASSERT(mGraph->OnGraphThread()); // Base implementation, for tracks that don't support direct track listeners. RefPtr<DirectMediaTrackListener> listener = aListener; listener->NotifyDirectListenerInstalled( @@ -2503,6 +2525,7 @@ void MediaTrack::RunAfterPendingUpdates( } void MediaTrack::SetDisabledTrackModeImpl(DisabledTrackMode aMode) { + MOZ_ASSERT(mGraph->OnGraphThread()); MOZ_DIAGNOSTIC_ASSERT( aMode == DisabledTrackMode::ENABLED || mDisabledMode == DisabledTrackMode::ENABLED, @@ -2531,22 +2554,8 @@ void MediaTrack::SetDisabledTrackMode(DisabledTrackMode aMode) { void MediaTrack::ApplyTrackDisabling(MediaSegment* aSegment, MediaSegment* aRawSegment) { - if (mDisabledMode == DisabledTrackMode::ENABLED) { - return; - } - if (mDisabledMode == DisabledTrackMode::SILENCE_BLACK) { - aSegment->ReplaceWithDisabled(); - if (aRawSegment) { - aRawSegment->ReplaceWithDisabled(); - } - } else if (mDisabledMode == DisabledTrackMode::SILENCE_FREEZE) { - aSegment->ReplaceWithNull(); - if (aRawSegment) { - aRawSegment->ReplaceWithNull(); - } - } else { - MOZ_CRASH("Unsupported mode"); - } + MOZ_ASSERT(mGraph->OnGraphThread()); + mozilla::ApplyTrackDisabling(mDisabledMode, aSegment, aRawSegment); } void MediaTrack::AddMainThreadListener( @@ -2866,7 +2875,7 @@ TrackTime SourceMediaTrack::AppendData(MediaSegment* aSegment, // Apply track disabling before notifying any consumers directly // or inserting into the graph - ApplyTrackDisabling(aSegment, aRawSegment); + mozilla::ApplyTrackDisabling(mDirectDisabledMode, aSegment, aRawSegment); ResampleAudioToGraphSampleRate(aSegment); @@ -2910,6 +2919,7 @@ void SourceMediaTrack::NotifyDirectConsumers(MediaSegment* aSegment) { void SourceMediaTrack::AddDirectListenerImpl( already_AddRefed<DirectMediaTrackListener> aListener) { + MOZ_ASSERT(mGraph->OnGraphThread()); MutexAutoLock lock(mMutex); RefPtr<DirectMediaTrackListener> listener = aListener; @@ -2979,6 +2989,7 @@ void SourceMediaTrack::AddDirectListenerImpl( void SourceMediaTrack::RemoveDirectListenerImpl( DirectMediaTrackListener* aListener) { + mGraph->AssertOnGraphThreadOrNotRunning(); MutexAutoLock lock(mMutex); for (int32_t i = mDirectTrackListeners.Length() - 1; i >= 0; --i) { const RefPtr<DirectMediaTrackListener>& l = mDirectTrackListeners[i]; @@ -3008,17 +3019,20 @@ void SourceMediaTrack::End() { } void SourceMediaTrack::SetDisabledTrackModeImpl(DisabledTrackMode aMode) { + MOZ_ASSERT(mGraph->OnGraphThread()); { MutexAutoLock lock(mMutex); + const DisabledTrackMode oldMode = mDirectDisabledMode; + const bool oldEnabled = oldMode == DisabledTrackMode::ENABLED; + const bool enabled = aMode == DisabledTrackMode::ENABLED; + mDirectDisabledMode = aMode; for (const auto& l : mDirectTrackListeners) { - DisabledTrackMode oldMode = mDisabledMode; - bool oldEnabled = oldMode == DisabledTrackMode::ENABLED; - if (!oldEnabled && aMode == DisabledTrackMode::ENABLED) { + if (!oldEnabled && enabled) { LOG(LogLevel::Debug, ("%p: SourceMediaTrack %p setting " "direct listener enabled", GraphImpl(), this)); l->DecreaseDisabled(oldMode); - } else if (oldEnabled && aMode != DisabledTrackMode::ENABLED) { + } else if (oldEnabled && !enabled) { LOG(LogLevel::Debug, ("%p: SourceMediaTrack %p setting " "direct listener disabled", GraphImpl(), this)); ===================================== dom/media/MediaTrackGraph.h ===================================== @@ -652,18 +652,8 @@ class SourceMediaTrack : public MediaTrack { */ void End(); - // Overriding allows us to hold the mMutex lock while changing the track - // enable status void SetDisabledTrackModeImpl(DisabledTrackMode aMode) override; - // Overriding allows us to ensure mMutex is locked while changing the track - // enable status - void ApplyTrackDisabling(MediaSegment* aSegment, - MediaSegment* aRawSegment = nullptr) override { - mMutex.AssertCurrentThreadOwns(); - MediaTrack::ApplyTrackDisabling(aSegment, aRawSegment); - } - uint32_t NumberOfChannels() const override; void RemoveAllDirectListenersImpl() override; @@ -742,6 +732,11 @@ class SourceMediaTrack : public MediaTrack { // protected by mMutex float mVolume MOZ_GUARDED_BY(mMutex) = 1.0; UniquePtr<TrackData> mUpdateTrack MOZ_GUARDED_BY(mMutex); + // This track's associated disabled mode for uses on the producing thread. + // It can either by disabled by frames being replaced by black, or by + // retaining the previous frame. + DisabledTrackMode mDirectDisabledMode MOZ_GUARDED_BY(mMutex) = + DisabledTrackMode::ENABLED; nsTArray<RefPtr<DirectMediaTrackListener>> mDirectTrackListeners MOZ_GUARDED_BY(mMutex); }; ===================================== gfx/2d/RecordedEventImpl.h ===================================== @@ -65,7 +65,7 @@ class RecordedDrawTargetCreation BackendType mBackendType; IntRect mRect; SurfaceFormat mFormat; - bool mHasExistingData; + bool mHasExistingData = false; RefPtr<SourceSurface> mExistingData; private: ===================================== gfx/2d/RecordingTypes.h ===================================== @@ -24,6 +24,28 @@ struct ElementStreamFormat { aStream.read(reinterpret_cast<char*>(&aElement), sizeof(T)); } }; +template <class S> +struct ElementStreamFormat<S, bool> { + static void Write(S& aStream, const bool& aElement) { + char boolChar = aElement ? '\x01' : '\x00'; + aStream.write(&boolChar, sizeof(boolChar)); + } + static void Read(S& aStream, bool& aElement) { + char boolChar; + aStream.read(&boolChar, sizeof(boolChar)); + switch (boolChar) { + case '\x00': + aElement = false; + break; + case '\x01': + aElement = true; + break; + default: + aStream.SetIsBad(); + break; + } + } +}; template <class S, class T> void WriteElement(S& aStream, const T& aElement) { ===================================== netwerk/cookie/CookieCommons.cpp ===================================== @@ -200,9 +200,9 @@ bool CookieCommons::CheckNameAndValueSize(const CookieStruct& aCookieData) { bool CookieCommons::CheckName(const CookieStruct& aCookieData) { const char illegalNameCharacters[] = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, - 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, - 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x00}; + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, + 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, + 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x3B, 0x3D, 0x7F, 0x00}; const auto* start = aCookieData.name().BeginReading(); const auto* end = aCookieData.name().EndReading(); ===================================== testing/web-platform/meta/cookies/name/name-ctl.html.ini ===================================== @@ -11,36 +11,6 @@ [Cookie with %xd in name is rejected (DOM).] expected: FAIL - [Cookie with %x7f in name is rejected (DOM).] - expected: FAIL - - [Cookie with %x0 in name is rejected or modified (HTTP).] - expected: FAIL - - [Cookie with %x1 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x2 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x3 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x4 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x5 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x6 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x7 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x8 in name is rejected (HTTP).] - expected: FAIL - [Cookie with %x9 in name is accepted (HTTP).] expected: FAIL ===================================== testing/web-platform/meta/service-workers/cache-storage/cache-put.https.any.js.ini deleted ===================================== @@ -1,26 +0,0 @@ -[cache-put.https.any.serviceworker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.sharedworker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.worker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL ===================================== toolkit/components/httpsonlyerror/content/errorpage.html ===================================== @@ -67,6 +67,7 @@ <button id="openInsecure" data-l10n-id="about-httpsonly-button-continue-to-site" + inert ></button> </div> <div class="suggestion-box" hidden> ===================================== toolkit/components/httpsonlyerror/content/errorpage.js ===================================== @@ -34,6 +34,11 @@ function initPage() { .getElementById("openInsecure") .addEventListener("click", onOpenInsecureButtonClick); + const delay = RPMGetIntPref("security.dialog_enable_delay", 1000); + setTimeout(() => { + document.getElementById("openInsecure").removeAttribute("inert"); + }, delay); + if (window.top == window) { document .getElementById("goBack") ===================================== toolkit/components/search/OpenSearchEngine.sys.mjs ===================================== @@ -144,7 +144,12 @@ export class OpenSearchEngine extends SearchEngine { lazy.logConsole.debug("_install: Downloading engine from:", loadURI.spec); - var chan = lazy.SearchUtils.makeChannel(loadURI); + var chan = lazy.SearchUtils.makeChannel( + loadURI, + // OpenSearchEngine is loading a definition file for a search engine, + // TYPE_DOCUMENT captures that load best + Ci.nsIContentPolicy.TYPE_DOCUMENT + ); if (this._engineToUpdate && chan instanceof Ci.nsIHttpChannel) { var lastModified = this._engineToUpdate.getAttr("updatelastmodified"); ===================================== toolkit/components/search/SearchEngine.sys.mjs ===================================== @@ -821,7 +821,10 @@ export class SearchEngine { this._hasPreferredIcon = isPreferred; }; - let chan = lazy.SearchUtils.makeChannel(uri); + let chan = lazy.SearchUtils.makeChannel( + uri, + Ci.nsIContentPolicy.TYPE_IMAGE + ); let listener = new lazy.SearchUtils.LoadListener( chan, /^image\//, ===================================== toolkit/components/search/SearchUtils.sys.mjs ===================================== @@ -248,19 +248,24 @@ export var SearchUtils = { * * @param {string|nsIURI} url * The URL string from which to create an nsIChannel. + * @param {nsIContentPolicy} contentPolicyType + * The type of document being loaded. * @returns {nsIChannel} * an nsIChannel object, or null if the url is invalid. */ - makeChannel(url) { + makeChannel(url, contentPolicyType) { + if (!contentPolicyType) { + throw new Error("makeChannel called with invalid content policy type"); + } try { let uri = typeof url == "string" ? Services.io.newURI(url) : url; return Services.io.newChannelFromURI( uri, null /* loadingNode */, - Services.scriptSecurityManager.getSystemPrincipal(), + Services.scriptSecurityManager.createNullPrincipal({}), null /* triggeringPrincipal */, Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL, - Ci.nsIContentPolicy.TYPE_OTHER + contentPolicyType ); } catch (ex) {} ===================================== toolkit/components/search/tests/xpcshell/data/iconsRedirect.sjs ===================================== @@ -10,7 +10,7 @@ function handleRequest(request, response) { response.setStatusLine("1.1", 302, "Moved"); if (request.queryString == "type=invalid") { response.setHeader("Content-Type", "image/png", false); - response.setHeader("Location", "engine.xml", false); + response.setHeader("Location", "/head_search.js", false); } else { response.setHeader("Content-Type", "text/html", false); response.setHeader("Location", "remoteIcon.ico", false); ===================================== toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js ===================================== @@ -12,9 +12,11 @@ add_task(async function setup() { }); add_task(async function test_installedresourceicon() { + // Attempts to load a resource:// url as an icon. let engine1 = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}opensearch/resourceicon.xml`, }); + // Attempts to load a chrome:// url as an icon. let engine2 = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}opensearch/chromeicon.xml`, }); @@ -32,12 +34,13 @@ add_task(async function test_installedhttpplace() { // The easiest way to test adding the icon is via a generated xml, otherwise // we have to somehow insert the address of the server into it. + // Attempts to load a non-image page into an image icon. let engine = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}data/engineMaker.sjs?` + JSON.stringify({ baseURL: gDataUrl, - image: "opensearch/resourceicon.xml", + image: "head_search.js", name: "invalidicon", method: "GET", }), ===================================== toolkit/components/search/tests/xpcshell/test_webextensions_install.js ===================================== @@ -5,6 +5,8 @@ const { promiseShutdownManager, promiseStartupManager } = AddonTestUtils; +let gBaseUrl; + async function getEngineNames() { let engines = await Services.search.getEngines(); return engines.map(engine => engine._name); @@ -13,6 +15,8 @@ async function getEngineNames() { add_task(async function setup() { let server = useHttpServer(); server.registerContentType("sjs", "sjs"); + gBaseUrl = `http://localhost:${server.identity.primaryPort}/`; + await SearchTestUtils.useTestEngines("test-extensions"); await promiseStartupManager(); @@ -132,7 +136,7 @@ add_task(async function test_load_favicon_invalid() { // User installs a new search engine let extension = await SearchTestUtils.installSearchExtension( { - favicon_url: `${gDataUrl}engine.xml`, + favicon_url: `${gBaseUrl}/head_search.js`, }, { skipUnload: true } ); ===================================== toolkit/modules/RemotePageAccessManager.sys.mjs ===================================== @@ -66,6 +66,7 @@ export let RemotePageAccessManager = { }, "about:httpsonlyerror": { RPMGetFormatURLPref: ["app.support.baseURL"], + RPMGetIntPref: ["security.dialog_enable_delay"], RPMSendAsyncMessage: ["goBack", "openInsecure"], RPMAddMessageListener: ["WWWReachable"], RPMTryPingSecureWWWLink: ["*"], View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f3701b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f3701b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.4.0esr-13.5-1] 7 commits: Bug 1738426 - Ignoring status 206 and vary header checking for opaque response...
by richard (＠richard) 23 Oct '23

23 Oct '23

richard pushed to branch tor-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: b4ecf06a by Eden Chuang at 2023-10-23T12:29:13+00:00 Bug 1738426 - Ignoring status 206 and vary header checking for opaque response in Cache API. r=asuth Differential Revision: https://phabricator.services.mozilla.com/D186431 - - - - - 64bd0c0d by edgul at 2023-10-23T12:29:13+00:00 Bug 1802057 - Block the following characters from use in the cookie name in the cookie string: 0x3B (semi-colon), 0x3D (equals), and 0x7F (del) r=dveditz,cookie-reviewers Differential Revision: https://phabricator.services.mozilla.com/D182373 - - - - - 4ead76f7 by Kelsey Gilbert at 2023-10-23T12:29:14+00:00 Bug 1819497 - Don't race on static bool for initialization. r=gfx-reviewers,aosmond We could do non-racy static init here (e.g. with a static initializer self-calling-closure), but there doesn't seem to be a strong reason for this. Let's just use a switch and get robustness from -Werror=switch. Differential Revision: https://phabricator.services.mozilla.com/D188054 - - - - - ce34aa4f by Mark Banner at 2023-10-23T12:29:14+00:00 Bug 1845752. r=ckerschb Differential Revision: https://phabricator.services.mozilla.com/D186676 - - - - - 24a2f717 by Bob Owen at 2023-10-23T12:29:15+00:00 Bug 1850072: Initialize RecordedDrawTargetCreation::mHasExistingData. r=jrmuizel This also specializes ElementStreamFormat for bool. Differential Revision: https://phabricator.services.mozilla.com/D187794 - - - - - b41e1ac5 by Malte Juergens at 2023-10-23T12:29:15+00:00 Bug 1850200 - Add delay to HTTPS-Only "Continue to HTTPS Site" button r=freddyb Differential Revision: https://phabricator.services.mozilla.com/D187887 - - - - - 5d1936d6 by Andreas Pehrson at 2023-10-23T12:29:15+00:00 Bug 1851803 - Introduce SourceMediaTrack::mDirectDisabledMode. r=karlt Similar to MediaTrack::mDisabledMode, but this is for uses on the SourceMediaTrack producer thread. It is still signaled via a control message from the control thread to maintain order of operations, and is protected by the SourceMediaTrack mutex. Differential Revision: https://phabricator.services.mozilla.com/D187554 - - - - - 18 changed files: - dom/cache/TypeUtils.cpp - dom/canvas/WebGLContextExtensions.cpp - dom/media/MediaTrackGraph.cpp - dom/media/MediaTrackGraph.h - gfx/2d/RecordedEventImpl.h - gfx/2d/RecordingTypes.h - netwerk/cookie/CookieCommons.cpp - testing/web-platform/meta/cookies/name/name-ctl.html.ini - − testing/web-platform/meta/service-workers/cache-storage/cache-put.https.any.js.ini - toolkit/components/httpsonlyerror/content/errorpage.html - toolkit/components/httpsonlyerror/content/errorpage.js - toolkit/components/search/OpenSearchEngine.sys.mjs - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/search/SearchUtils.sys.mjs - toolkit/components/search/tests/xpcshell/data/iconsRedirect.sjs - toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js - toolkit/components/search/tests/xpcshell/test_webextensions_install.js - toolkit/modules/RemotePageAccessManager.sys.mjs Changes: ===================================== dom/cache/TypeUtils.cpp ===================================== @@ -184,7 +184,7 @@ void TypeUtils::ToCacheResponseWithoutBody(CacheResponse& aOut, aOut.statusText() = aIn.GetUnfilteredStatusText(); RefPtr<InternalHeaders> headers = aIn.UnfilteredHeaders(); MOZ_DIAGNOSTIC_ASSERT(headers); - if (HasVaryStar(headers)) { + if (aIn.Type() != ResponseType::Opaque && HasVaryStar(headers)) { aRv.ThrowTypeError("Invalid Response object with a 'Vary: *' header."); return; } ===================================== dom/canvas/WebGLContextExtensions.cpp ===================================== @@ -17,15 +17,10 @@ namespace mozilla { const char* GetExtensionName(const WebGLExtensionID ext) { - static EnumeratedArray<WebGLExtensionID, WebGLExtensionID::Max, const char*> - sExtensionNamesEnumeratedArray; - static bool initialized = false; - - if (!initialized) { - initialized = true; - + switch (ext) { #define WEBGL_EXTENSION_IDENTIFIER(x) \ - sExtensionNamesEnumeratedArray[WebGLExtensionID::x] = #x; + case WebGLExtensionID::x: \ + return #x; WEBGL_EXTENSION_IDENTIFIER(ANGLE_instanced_arrays) WEBGL_EXTENSION_IDENTIFIER(EXT_blend_minmax) @@ -67,9 +62,11 @@ const char* GetExtensionName(const WebGLExtensionID ext) { WEBGL_EXTENSION_IDENTIFIER(WEBGL_provoking_vertex) #undef WEBGL_EXTENSION_IDENTIFIER - } - return sExtensionNamesEnumeratedArray[ext]; + case WebGLExtensionID::Max: + break; + } + MOZ_CRASH("bad WebGLExtensionID"); } // ---------------------------- ===================================== dom/media/MediaTrackGraph.cpp ===================================== @@ -145,6 +145,27 @@ class GraphKey final { nsTHashMap<nsGenericHashKey<GraphKey>, MediaTrackGraphImpl*> gGraphs; } // anonymous namespace +static void ApplyTrackDisabling(DisabledTrackMode aDisabledMode, + MediaSegment* aSegment, + MediaSegment* aRawSegment) { + if (aDisabledMode == DisabledTrackMode::ENABLED) { + return; + } + if (aDisabledMode == DisabledTrackMode::SILENCE_BLACK) { + aSegment->ReplaceWithDisabled(); + if (aRawSegment) { + aRawSegment->ReplaceWithDisabled(); + } + } else if (aDisabledMode == DisabledTrackMode::SILENCE_FREEZE) { + aSegment->ReplaceWithNull(); + if (aRawSegment) { + aRawSegment->ReplaceWithNull(); + } + } else { + MOZ_CRASH("Unsupported mode"); + } +} + MediaTrackGraphImpl::~MediaTrackGraphImpl() { MOZ_ASSERT(mTracks.IsEmpty() && mSuspendedTracks.IsEmpty(), "All tracks should have been destroyed by messages from the main " @@ -2421,6 +2442,7 @@ RefPtr<GenericPromise> MediaTrack::RemoveListener( void MediaTrack::AddDirectListenerImpl( already_AddRefed<DirectMediaTrackListener> aListener) { + MOZ_ASSERT(mGraph->OnGraphThread()); // Base implementation, for tracks that don't support direct track listeners. RefPtr<DirectMediaTrackListener> listener = aListener; listener->NotifyDirectListenerInstalled( @@ -2503,6 +2525,7 @@ void MediaTrack::RunAfterPendingUpdates( } void MediaTrack::SetDisabledTrackModeImpl(DisabledTrackMode aMode) { + MOZ_ASSERT(mGraph->OnGraphThread()); MOZ_DIAGNOSTIC_ASSERT( aMode == DisabledTrackMode::ENABLED || mDisabledMode == DisabledTrackMode::ENABLED, @@ -2531,22 +2554,8 @@ void MediaTrack::SetDisabledTrackMode(DisabledTrackMode aMode) { void MediaTrack::ApplyTrackDisabling(MediaSegment* aSegment, MediaSegment* aRawSegment) { - if (mDisabledMode == DisabledTrackMode::ENABLED) { - return; - } - if (mDisabledMode == DisabledTrackMode::SILENCE_BLACK) { - aSegment->ReplaceWithDisabled(); - if (aRawSegment) { - aRawSegment->ReplaceWithDisabled(); - } - } else if (mDisabledMode == DisabledTrackMode::SILENCE_FREEZE) { - aSegment->ReplaceWithNull(); - if (aRawSegment) { - aRawSegment->ReplaceWithNull(); - } - } else { - MOZ_CRASH("Unsupported mode"); - } + MOZ_ASSERT(mGraph->OnGraphThread()); + mozilla::ApplyTrackDisabling(mDisabledMode, aSegment, aRawSegment); } void MediaTrack::AddMainThreadListener( @@ -2866,7 +2875,7 @@ TrackTime SourceMediaTrack::AppendData(MediaSegment* aSegment, // Apply track disabling before notifying any consumers directly // or inserting into the graph - ApplyTrackDisabling(aSegment, aRawSegment); + mozilla::ApplyTrackDisabling(mDirectDisabledMode, aSegment, aRawSegment); ResampleAudioToGraphSampleRate(aSegment); @@ -2910,6 +2919,7 @@ void SourceMediaTrack::NotifyDirectConsumers(MediaSegment* aSegment) { void SourceMediaTrack::AddDirectListenerImpl( already_AddRefed<DirectMediaTrackListener> aListener) { + MOZ_ASSERT(mGraph->OnGraphThread()); MutexAutoLock lock(mMutex); RefPtr<DirectMediaTrackListener> listener = aListener; @@ -2979,6 +2989,7 @@ void SourceMediaTrack::AddDirectListenerImpl( void SourceMediaTrack::RemoveDirectListenerImpl( DirectMediaTrackListener* aListener) { + mGraph->AssertOnGraphThreadOrNotRunning(); MutexAutoLock lock(mMutex); for (int32_t i = mDirectTrackListeners.Length() - 1; i >= 0; --i) { const RefPtr<DirectMediaTrackListener>& l = mDirectTrackListeners[i]; @@ -3008,17 +3019,20 @@ void SourceMediaTrack::End() { } void SourceMediaTrack::SetDisabledTrackModeImpl(DisabledTrackMode aMode) { + MOZ_ASSERT(mGraph->OnGraphThread()); { MutexAutoLock lock(mMutex); + const DisabledTrackMode oldMode = mDirectDisabledMode; + const bool oldEnabled = oldMode == DisabledTrackMode::ENABLED; + const bool enabled = aMode == DisabledTrackMode::ENABLED; + mDirectDisabledMode = aMode; for (const auto& l : mDirectTrackListeners) { - DisabledTrackMode oldMode = mDisabledMode; - bool oldEnabled = oldMode == DisabledTrackMode::ENABLED; - if (!oldEnabled && aMode == DisabledTrackMode::ENABLED) { + if (!oldEnabled && enabled) { LOG(LogLevel::Debug, ("%p: SourceMediaTrack %p setting " "direct listener enabled", GraphImpl(), this)); l->DecreaseDisabled(oldMode); - } else if (oldEnabled && aMode != DisabledTrackMode::ENABLED) { + } else if (oldEnabled && !enabled) { LOG(LogLevel::Debug, ("%p: SourceMediaTrack %p setting " "direct listener disabled", GraphImpl(), this)); ===================================== dom/media/MediaTrackGraph.h ===================================== @@ -652,18 +652,8 @@ class SourceMediaTrack : public MediaTrack { */ void End(); - // Overriding allows us to hold the mMutex lock while changing the track - // enable status void SetDisabledTrackModeImpl(DisabledTrackMode aMode) override; - // Overriding allows us to ensure mMutex is locked while changing the track - // enable status - void ApplyTrackDisabling(MediaSegment* aSegment, - MediaSegment* aRawSegment = nullptr) override { - mMutex.AssertCurrentThreadOwns(); - MediaTrack::ApplyTrackDisabling(aSegment, aRawSegment); - } - uint32_t NumberOfChannels() const override; void RemoveAllDirectListenersImpl() override; @@ -742,6 +732,11 @@ class SourceMediaTrack : public MediaTrack { // protected by mMutex float mVolume MOZ_GUARDED_BY(mMutex) = 1.0; UniquePtr<TrackData> mUpdateTrack MOZ_GUARDED_BY(mMutex); + // This track's associated disabled mode for uses on the producing thread. + // It can either by disabled by frames being replaced by black, or by + // retaining the previous frame. + DisabledTrackMode mDirectDisabledMode MOZ_GUARDED_BY(mMutex) = + DisabledTrackMode::ENABLED; nsTArray<RefPtr<DirectMediaTrackListener>> mDirectTrackListeners MOZ_GUARDED_BY(mMutex); }; ===================================== gfx/2d/RecordedEventImpl.h ===================================== @@ -65,7 +65,7 @@ class RecordedDrawTargetCreation BackendType mBackendType; IntRect mRect; SurfaceFormat mFormat; - bool mHasExistingData; + bool mHasExistingData = false; RefPtr<SourceSurface> mExistingData; private: ===================================== gfx/2d/RecordingTypes.h ===================================== @@ -24,6 +24,28 @@ struct ElementStreamFormat { aStream.read(reinterpret_cast<char*>(&aElement), sizeof(T)); } }; +template <class S> +struct ElementStreamFormat<S, bool> { + static void Write(S& aStream, const bool& aElement) { + char boolChar = aElement ? '\x01' : '\x00'; + aStream.write(&boolChar, sizeof(boolChar)); + } + static void Read(S& aStream, bool& aElement) { + char boolChar; + aStream.read(&boolChar, sizeof(boolChar)); + switch (boolChar) { + case '\x00': + aElement = false; + break; + case '\x01': + aElement = true; + break; + default: + aStream.SetIsBad(); + break; + } + } +}; template <class S, class T> void WriteElement(S& aStream, const T& aElement) { ===================================== netwerk/cookie/CookieCommons.cpp ===================================== @@ -200,9 +200,9 @@ bool CookieCommons::CheckNameAndValueSize(const CookieStruct& aCookieData) { bool CookieCommons::CheckName(const CookieStruct& aCookieData) { const char illegalNameCharacters[] = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, - 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, - 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x00}; + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, + 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, + 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x3B, 0x3D, 0x7F, 0x00}; const auto* start = aCookieData.name().BeginReading(); const auto* end = aCookieData.name().EndReading(); ===================================== testing/web-platform/meta/cookies/name/name-ctl.html.ini ===================================== @@ -11,36 +11,6 @@ [Cookie with %xd in name is rejected (DOM).] expected: FAIL - [Cookie with %x7f in name is rejected (DOM).] - expected: FAIL - - [Cookie with %x0 in name is rejected or modified (HTTP).] - expected: FAIL - - [Cookie with %x1 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x2 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x3 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x4 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x5 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x6 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x7 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x8 in name is rejected (HTTP).] - expected: FAIL - [Cookie with %x9 in name is accepted (HTTP).] expected: FAIL ===================================== testing/web-platform/meta/service-workers/cache-storage/cache-put.https.any.js.ini deleted ===================================== @@ -1,26 +0,0 @@ -[cache-put.https.any.serviceworker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.sharedworker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.worker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL ===================================== toolkit/components/httpsonlyerror/content/errorpage.html ===================================== @@ -67,6 +67,7 @@ <button id="openInsecure" data-l10n-id="about-httpsonly-button-continue-to-site" + inert ></button> </div> <div class="suggestion-box" hidden> ===================================== toolkit/components/httpsonlyerror/content/errorpage.js ===================================== @@ -34,6 +34,11 @@ function initPage() { .getElementById("openInsecure") .addEventListener("click", onOpenInsecureButtonClick); + const delay = RPMGetIntPref("security.dialog_enable_delay", 1000); + setTimeout(() => { + document.getElementById("openInsecure").removeAttribute("inert"); + }, delay); + if (window.top == window) { document .getElementById("goBack") ===================================== toolkit/components/search/OpenSearchEngine.sys.mjs ===================================== @@ -144,7 +144,12 @@ export class OpenSearchEngine extends SearchEngine { lazy.logConsole.debug("_install: Downloading engine from:", loadURI.spec); - var chan = lazy.SearchUtils.makeChannel(loadURI); + var chan = lazy.SearchUtils.makeChannel( + loadURI, + // OpenSearchEngine is loading a definition file for a search engine, + // TYPE_DOCUMENT captures that load best + Ci.nsIContentPolicy.TYPE_DOCUMENT + ); if (this._engineToUpdate && chan instanceof Ci.nsIHttpChannel) { var lastModified = this._engineToUpdate.getAttr("updatelastmodified"); ===================================== toolkit/components/search/SearchEngine.sys.mjs ===================================== @@ -821,7 +821,10 @@ export class SearchEngine { this._hasPreferredIcon = isPreferred; }; - let chan = lazy.SearchUtils.makeChannel(uri); + let chan = lazy.SearchUtils.makeChannel( + uri, + Ci.nsIContentPolicy.TYPE_IMAGE + ); let listener = new lazy.SearchUtils.LoadListener( chan, /^image\//, ===================================== toolkit/components/search/SearchUtils.sys.mjs ===================================== @@ -248,19 +248,24 @@ export var SearchUtils = { * * @param {string|nsIURI} url * The URL string from which to create an nsIChannel. + * @param {nsIContentPolicy} contentPolicyType + * The type of document being loaded. * @returns {nsIChannel} * an nsIChannel object, or null if the url is invalid. */ - makeChannel(url) { + makeChannel(url, contentPolicyType) { + if (!contentPolicyType) { + throw new Error("makeChannel called with invalid content policy type"); + } try { let uri = typeof url == "string" ? Services.io.newURI(url) : url; return Services.io.newChannelFromURI( uri, null /* loadingNode */, - Services.scriptSecurityManager.getSystemPrincipal(), + Services.scriptSecurityManager.createNullPrincipal({}), null /* triggeringPrincipal */, Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL, - Ci.nsIContentPolicy.TYPE_OTHER + contentPolicyType ); } catch (ex) {} ===================================== toolkit/components/search/tests/xpcshell/data/iconsRedirect.sjs ===================================== @@ -10,7 +10,7 @@ function handleRequest(request, response) { response.setStatusLine("1.1", 302, "Moved"); if (request.queryString == "type=invalid") { response.setHeader("Content-Type", "image/png", false); - response.setHeader("Location", "engine.xml", false); + response.setHeader("Location", "/head_search.js", false); } else { response.setHeader("Content-Type", "text/html", false); response.setHeader("Location", "remoteIcon.ico", false); ===================================== toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js ===================================== @@ -12,9 +12,11 @@ add_task(async function setup() { }); add_task(async function test_installedresourceicon() { + // Attempts to load a resource:// url as an icon. let engine1 = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}opensearch/resourceicon.xml`, }); + // Attempts to load a chrome:// url as an icon. let engine2 = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}opensearch/chromeicon.xml`, }); @@ -32,12 +34,13 @@ add_task(async function test_installedhttpplace() { // The easiest way to test adding the icon is via a generated xml, otherwise // we have to somehow insert the address of the server into it. + // Attempts to load a non-image page into an image icon. let engine = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}data/engineMaker.sjs?` + JSON.stringify({ baseURL: gDataUrl, - image: "opensearch/resourceicon.xml", + image: "head_search.js", name: "invalidicon", method: "GET", }), ===================================== toolkit/components/search/tests/xpcshell/test_webextensions_install.js ===================================== @@ -5,6 +5,8 @@ const { promiseShutdownManager, promiseStartupManager } = AddonTestUtils; +let gBaseUrl; + async function getEngineNames() { let engines = await Services.search.getEngines(); return engines.map(engine => engine._name); @@ -13,6 +15,8 @@ async function getEngineNames() { add_task(async function setup() { let server = useHttpServer(); server.registerContentType("sjs", "sjs"); + gBaseUrl = `http://localhost:${server.identity.primaryPort}/`; + await SearchTestUtils.useTestEngines("test-extensions"); await promiseStartupManager(); @@ -132,7 +136,7 @@ add_task(async function test_load_favicon_invalid() { // User installs a new search engine let extension = await SearchTestUtils.installSearchExtension( { - favicon_url: `${gDataUrl}engine.xml`, + favicon_url: `${gBaseUrl}/head_search.js`, }, { skipUnload: true } ); ===================================== toolkit/modules/RemotePageAccessManager.sys.mjs ===================================== @@ -66,6 +66,7 @@ export let RemotePageAccessManager = { }, "about:httpsonlyerror": { RPMGetFormatURLPref: ["app.support.baseURL"], + RPMGetIntPref: ["security.dialog_enable_delay"], RPMSendAsyncMessage: ["goBack", "openInsecure"], RPMAddMessageListener: ["WWWReachable"], RPMTryPingSecureWWWLink: ["*"], View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8982a3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8982a3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.4.0esr-13.0-1] 7 commits: Bug 1738426 - Ignoring status 206 and vary header checking for opaque response...
by richard (＠richard) 23 Oct '23

23 Oct '23

richard pushed to branch mullvad-browser-115.4.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 00e0b1d4 by Eden Chuang at 2023-10-23T12:18:47+00:00 Bug 1738426 - Ignoring status 206 and vary header checking for opaque response in Cache API. r=asuth Differential Revision: https://phabricator.services.mozilla.com/D186431 - - - - - 19e02723 by edgul at 2023-10-23T12:18:48+00:00 Bug 1802057 - Block the following characters from use in the cookie name in the cookie string: 0x3B (semi-colon), 0x3D (equals), and 0x7F (del) r=dveditz,cookie-reviewers Differential Revision: https://phabricator.services.mozilla.com/D182373 - - - - - 18e737f2 by Kelsey Gilbert at 2023-10-23T12:18:48+00:00 Bug 1819497 - Don't race on static bool for initialization. r=gfx-reviewers,aosmond We could do non-racy static init here (e.g. with a static initializer self-calling-closure), but there doesn't seem to be a strong reason for this. Let's just use a switch and get robustness from -Werror=switch. Differential Revision: https://phabricator.services.mozilla.com/D188054 - - - - - 57c1d25a by Mark Banner at 2023-10-23T12:18:48+00:00 Bug 1845752. r=ckerschb Differential Revision: https://phabricator.services.mozilla.com/D186676 - - - - - cc34ac65 by Bob Owen at 2023-10-23T12:18:49+00:00 Bug 1850072: Initialize RecordedDrawTargetCreation::mHasExistingData. r=jrmuizel This also specializes ElementStreamFormat for bool. Differential Revision: https://phabricator.services.mozilla.com/D187794 - - - - - 75377f78 by Malte Juergens at 2023-10-23T12:18:49+00:00 Bug 1850200 - Add delay to HTTPS-Only "Continue to HTTPS Site" button r=freddyb Differential Revision: https://phabricator.services.mozilla.com/D187887 - - - - - d366918b by Andreas Pehrson at 2023-10-23T12:18:49+00:00 Bug 1851803 - Introduce SourceMediaTrack::mDirectDisabledMode. r=karlt Similar to MediaTrack::mDisabledMode, but this is for uses on the SourceMediaTrack producer thread. It is still signaled via a control message from the control thread to maintain order of operations, and is protected by the SourceMediaTrack mutex. Differential Revision: https://phabricator.services.mozilla.com/D187554 - - - - - 18 changed files: - dom/cache/TypeUtils.cpp - dom/canvas/WebGLContextExtensions.cpp - dom/media/MediaTrackGraph.cpp - dom/media/MediaTrackGraph.h - gfx/2d/RecordedEventImpl.h - gfx/2d/RecordingTypes.h - netwerk/cookie/CookieCommons.cpp - testing/web-platform/meta/cookies/name/name-ctl.html.ini - − testing/web-platform/meta/service-workers/cache-storage/cache-put.https.any.js.ini - toolkit/components/httpsonlyerror/content/errorpage.html - toolkit/components/httpsonlyerror/content/errorpage.js - toolkit/components/search/OpenSearchEngine.sys.mjs - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/search/SearchUtils.sys.mjs - toolkit/components/search/tests/xpcshell/data/iconsRedirect.sjs - toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js - toolkit/components/search/tests/xpcshell/test_webextensions_install.js - toolkit/modules/RemotePageAccessManager.sys.mjs Changes: ===================================== dom/cache/TypeUtils.cpp ===================================== @@ -184,7 +184,7 @@ void TypeUtils::ToCacheResponseWithoutBody(CacheResponse& aOut, aOut.statusText() = aIn.GetUnfilteredStatusText(); RefPtr<InternalHeaders> headers = aIn.UnfilteredHeaders(); MOZ_DIAGNOSTIC_ASSERT(headers); - if (HasVaryStar(headers)) { + if (aIn.Type() != ResponseType::Opaque && HasVaryStar(headers)) { aRv.ThrowTypeError("Invalid Response object with a 'Vary: *' header."); return; } ===================================== dom/canvas/WebGLContextExtensions.cpp ===================================== @@ -17,15 +17,10 @@ namespace mozilla { const char* GetExtensionName(const WebGLExtensionID ext) { - static EnumeratedArray<WebGLExtensionID, WebGLExtensionID::Max, const char*> - sExtensionNamesEnumeratedArray; - static bool initialized = false; - - if (!initialized) { - initialized = true; - + switch (ext) { #define WEBGL_EXTENSION_IDENTIFIER(x) \ - sExtensionNamesEnumeratedArray[WebGLExtensionID::x] = #x; + case WebGLExtensionID::x: \ + return #x; WEBGL_EXTENSION_IDENTIFIER(ANGLE_instanced_arrays) WEBGL_EXTENSION_IDENTIFIER(EXT_blend_minmax) @@ -67,9 +62,11 @@ const char* GetExtensionName(const WebGLExtensionID ext) { WEBGL_EXTENSION_IDENTIFIER(WEBGL_provoking_vertex) #undef WEBGL_EXTENSION_IDENTIFIER - } - return sExtensionNamesEnumeratedArray[ext]; + case WebGLExtensionID::Max: + break; + } + MOZ_CRASH("bad WebGLExtensionID"); } // ---------------------------- ===================================== dom/media/MediaTrackGraph.cpp ===================================== @@ -145,6 +145,27 @@ class GraphKey final { nsTHashMap<nsGenericHashKey<GraphKey>, MediaTrackGraphImpl*> gGraphs; } // anonymous namespace +static void ApplyTrackDisabling(DisabledTrackMode aDisabledMode, + MediaSegment* aSegment, + MediaSegment* aRawSegment) { + if (aDisabledMode == DisabledTrackMode::ENABLED) { + return; + } + if (aDisabledMode == DisabledTrackMode::SILENCE_BLACK) { + aSegment->ReplaceWithDisabled(); + if (aRawSegment) { + aRawSegment->ReplaceWithDisabled(); + } + } else if (aDisabledMode == DisabledTrackMode::SILENCE_FREEZE) { + aSegment->ReplaceWithNull(); + if (aRawSegment) { + aRawSegment->ReplaceWithNull(); + } + } else { + MOZ_CRASH("Unsupported mode"); + } +} + MediaTrackGraphImpl::~MediaTrackGraphImpl() { MOZ_ASSERT(mTracks.IsEmpty() && mSuspendedTracks.IsEmpty(), "All tracks should have been destroyed by messages from the main " @@ -2421,6 +2442,7 @@ RefPtr<GenericPromise> MediaTrack::RemoveListener( void MediaTrack::AddDirectListenerImpl( already_AddRefed<DirectMediaTrackListener> aListener) { + MOZ_ASSERT(mGraph->OnGraphThread()); // Base implementation, for tracks that don't support direct track listeners. RefPtr<DirectMediaTrackListener> listener = aListener; listener->NotifyDirectListenerInstalled( @@ -2503,6 +2525,7 @@ void MediaTrack::RunAfterPendingUpdates( } void MediaTrack::SetDisabledTrackModeImpl(DisabledTrackMode aMode) { + MOZ_ASSERT(mGraph->OnGraphThread()); MOZ_DIAGNOSTIC_ASSERT( aMode == DisabledTrackMode::ENABLED || mDisabledMode == DisabledTrackMode::ENABLED, @@ -2531,22 +2554,8 @@ void MediaTrack::SetDisabledTrackMode(DisabledTrackMode aMode) { void MediaTrack::ApplyTrackDisabling(MediaSegment* aSegment, MediaSegment* aRawSegment) { - if (mDisabledMode == DisabledTrackMode::ENABLED) { - return; - } - if (mDisabledMode == DisabledTrackMode::SILENCE_BLACK) { - aSegment->ReplaceWithDisabled(); - if (aRawSegment) { - aRawSegment->ReplaceWithDisabled(); - } - } else if (mDisabledMode == DisabledTrackMode::SILENCE_FREEZE) { - aSegment->ReplaceWithNull(); - if (aRawSegment) { - aRawSegment->ReplaceWithNull(); - } - } else { - MOZ_CRASH("Unsupported mode"); - } + MOZ_ASSERT(mGraph->OnGraphThread()); + mozilla::ApplyTrackDisabling(mDisabledMode, aSegment, aRawSegment); } void MediaTrack::AddMainThreadListener( @@ -2866,7 +2875,7 @@ TrackTime SourceMediaTrack::AppendData(MediaSegment* aSegment, // Apply track disabling before notifying any consumers directly // or inserting into the graph - ApplyTrackDisabling(aSegment, aRawSegment); + mozilla::ApplyTrackDisabling(mDirectDisabledMode, aSegment, aRawSegment); ResampleAudioToGraphSampleRate(aSegment); @@ -2910,6 +2919,7 @@ void SourceMediaTrack::NotifyDirectConsumers(MediaSegment* aSegment) { void SourceMediaTrack::AddDirectListenerImpl( already_AddRefed<DirectMediaTrackListener> aListener) { + MOZ_ASSERT(mGraph->OnGraphThread()); MutexAutoLock lock(mMutex); RefPtr<DirectMediaTrackListener> listener = aListener; @@ -2979,6 +2989,7 @@ void SourceMediaTrack::AddDirectListenerImpl( void SourceMediaTrack::RemoveDirectListenerImpl( DirectMediaTrackListener* aListener) { + mGraph->AssertOnGraphThreadOrNotRunning(); MutexAutoLock lock(mMutex); for (int32_t i = mDirectTrackListeners.Length() - 1; i >= 0; --i) { const RefPtr<DirectMediaTrackListener>& l = mDirectTrackListeners[i]; @@ -3008,17 +3019,20 @@ void SourceMediaTrack::End() { } void SourceMediaTrack::SetDisabledTrackModeImpl(DisabledTrackMode aMode) { + MOZ_ASSERT(mGraph->OnGraphThread()); { MutexAutoLock lock(mMutex); + const DisabledTrackMode oldMode = mDirectDisabledMode; + const bool oldEnabled = oldMode == DisabledTrackMode::ENABLED; + const bool enabled = aMode == DisabledTrackMode::ENABLED; + mDirectDisabledMode = aMode; for (const auto& l : mDirectTrackListeners) { - DisabledTrackMode oldMode = mDisabledMode; - bool oldEnabled = oldMode == DisabledTrackMode::ENABLED; - if (!oldEnabled && aMode == DisabledTrackMode::ENABLED) { + if (!oldEnabled && enabled) { LOG(LogLevel::Debug, ("%p: SourceMediaTrack %p setting " "direct listener enabled", GraphImpl(), this)); l->DecreaseDisabled(oldMode); - } else if (oldEnabled && aMode != DisabledTrackMode::ENABLED) { + } else if (oldEnabled && !enabled) { LOG(LogLevel::Debug, ("%p: SourceMediaTrack %p setting " "direct listener disabled", GraphImpl(), this)); ===================================== dom/media/MediaTrackGraph.h ===================================== @@ -652,18 +652,8 @@ class SourceMediaTrack : public MediaTrack { */ void End(); - // Overriding allows us to hold the mMutex lock while changing the track - // enable status void SetDisabledTrackModeImpl(DisabledTrackMode aMode) override; - // Overriding allows us to ensure mMutex is locked while changing the track - // enable status - void ApplyTrackDisabling(MediaSegment* aSegment, - MediaSegment* aRawSegment = nullptr) override { - mMutex.AssertCurrentThreadOwns(); - MediaTrack::ApplyTrackDisabling(aSegment, aRawSegment); - } - uint32_t NumberOfChannels() const override; void RemoveAllDirectListenersImpl() override; @@ -742,6 +732,11 @@ class SourceMediaTrack : public MediaTrack { // protected by mMutex float mVolume MOZ_GUARDED_BY(mMutex) = 1.0; UniquePtr<TrackData> mUpdateTrack MOZ_GUARDED_BY(mMutex); + // This track's associated disabled mode for uses on the producing thread. + // It can either by disabled by frames being replaced by black, or by + // retaining the previous frame. + DisabledTrackMode mDirectDisabledMode MOZ_GUARDED_BY(mMutex) = + DisabledTrackMode::ENABLED; nsTArray<RefPtr<DirectMediaTrackListener>> mDirectTrackListeners MOZ_GUARDED_BY(mMutex); }; ===================================== gfx/2d/RecordedEventImpl.h ===================================== @@ -65,7 +65,7 @@ class RecordedDrawTargetCreation BackendType mBackendType; IntRect mRect; SurfaceFormat mFormat; - bool mHasExistingData; + bool mHasExistingData = false; RefPtr<SourceSurface> mExistingData; private: ===================================== gfx/2d/RecordingTypes.h ===================================== @@ -24,6 +24,28 @@ struct ElementStreamFormat { aStream.read(reinterpret_cast<char*>(&aElement), sizeof(T)); } }; +template <class S> +struct ElementStreamFormat<S, bool> { + static void Write(S& aStream, const bool& aElement) { + char boolChar = aElement ? '\x01' : '\x00'; + aStream.write(&boolChar, sizeof(boolChar)); + } + static void Read(S& aStream, bool& aElement) { + char boolChar; + aStream.read(&boolChar, sizeof(boolChar)); + switch (boolChar) { + case '\x00': + aElement = false; + break; + case '\x01': + aElement = true; + break; + default: + aStream.SetIsBad(); + break; + } + } +}; template <class S, class T> void WriteElement(S& aStream, const T& aElement) { ===================================== netwerk/cookie/CookieCommons.cpp ===================================== @@ -200,9 +200,9 @@ bool CookieCommons::CheckNameAndValueSize(const CookieStruct& aCookieData) { bool CookieCommons::CheckName(const CookieStruct& aCookieData) { const char illegalNameCharacters[] = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, - 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, - 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x00}; + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, + 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, + 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x3B, 0x3D, 0x7F, 0x00}; const auto* start = aCookieData.name().BeginReading(); const auto* end = aCookieData.name().EndReading(); ===================================== testing/web-platform/meta/cookies/name/name-ctl.html.ini ===================================== @@ -11,36 +11,6 @@ [Cookie with %xd in name is rejected (DOM).] expected: FAIL - [Cookie with %x7f in name is rejected (DOM).] - expected: FAIL - - [Cookie with %x0 in name is rejected or modified (HTTP).] - expected: FAIL - - [Cookie with %x1 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x2 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x3 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x4 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x5 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x6 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x7 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x8 in name is rejected (HTTP).] - expected: FAIL - [Cookie with %x9 in name is accepted (HTTP).] expected: FAIL ===================================== testing/web-platform/meta/service-workers/cache-storage/cache-put.https.any.js.ini deleted ===================================== @@ -1,26 +0,0 @@ -[cache-put.https.any.serviceworker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.sharedworker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.worker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL ===================================== toolkit/components/httpsonlyerror/content/errorpage.html ===================================== @@ -67,6 +67,7 @@ <button id="openInsecure" data-l10n-id="about-httpsonly-button-continue-to-site" + inert ></button> </div> <div class="suggestion-box" hidden> ===================================== toolkit/components/httpsonlyerror/content/errorpage.js ===================================== @@ -34,6 +34,11 @@ function initPage() { .getElementById("openInsecure") .addEventListener("click", onOpenInsecureButtonClick); + const delay = RPMGetIntPref("security.dialog_enable_delay", 1000); + setTimeout(() => { + document.getElementById("openInsecure").removeAttribute("inert"); + }, delay); + if (window.top == window) { document .getElementById("goBack") ===================================== toolkit/components/search/OpenSearchEngine.sys.mjs ===================================== @@ -144,7 +144,12 @@ export class OpenSearchEngine extends SearchEngine { lazy.logConsole.debug("_install: Downloading engine from:", loadURI.spec); - var chan = lazy.SearchUtils.makeChannel(loadURI); + var chan = lazy.SearchUtils.makeChannel( + loadURI, + // OpenSearchEngine is loading a definition file for a search engine, + // TYPE_DOCUMENT captures that load best + Ci.nsIContentPolicy.TYPE_DOCUMENT + ); if (this._engineToUpdate && chan instanceof Ci.nsIHttpChannel) { var lastModified = this._engineToUpdate.getAttr("updatelastmodified"); ===================================== toolkit/components/search/SearchEngine.sys.mjs ===================================== @@ -821,7 +821,10 @@ export class SearchEngine { this._hasPreferredIcon = isPreferred; }; - let chan = lazy.SearchUtils.makeChannel(uri); + let chan = lazy.SearchUtils.makeChannel( + uri, + Ci.nsIContentPolicy.TYPE_IMAGE + ); let listener = new lazy.SearchUtils.LoadListener( chan, /^image\//, ===================================== toolkit/components/search/SearchUtils.sys.mjs ===================================== @@ -248,19 +248,24 @@ export var SearchUtils = { * * @param {string|nsIURI} url * The URL string from which to create an nsIChannel. + * @param {nsIContentPolicy} contentPolicyType + * The type of document being loaded. * @returns {nsIChannel} * an nsIChannel object, or null if the url is invalid. */ - makeChannel(url) { + makeChannel(url, contentPolicyType) { + if (!contentPolicyType) { + throw new Error("makeChannel called with invalid content policy type"); + } try { let uri = typeof url == "string" ? Services.io.newURI(url) : url; return Services.io.newChannelFromURI( uri, null /* loadingNode */, - Services.scriptSecurityManager.getSystemPrincipal(), + Services.scriptSecurityManager.createNullPrincipal({}), null /* triggeringPrincipal */, Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL, - Ci.nsIContentPolicy.TYPE_OTHER + contentPolicyType ); } catch (ex) {} ===================================== toolkit/components/search/tests/xpcshell/data/iconsRedirect.sjs ===================================== @@ -10,7 +10,7 @@ function handleRequest(request, response) { response.setStatusLine("1.1", 302, "Moved"); if (request.queryString == "type=invalid") { response.setHeader("Content-Type", "image/png", false); - response.setHeader("Location", "engine.xml", false); + response.setHeader("Location", "/head_search.js", false); } else { response.setHeader("Content-Type", "text/html", false); response.setHeader("Location", "remoteIcon.ico", false); ===================================== toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js ===================================== @@ -12,9 +12,11 @@ add_task(async function setup() { }); add_task(async function test_installedresourceicon() { + // Attempts to load a resource:// url as an icon. let engine1 = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}opensearch/resourceicon.xml`, }); + // Attempts to load a chrome:// url as an icon. let engine2 = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}opensearch/chromeicon.xml`, }); @@ -32,12 +34,13 @@ add_task(async function test_installedhttpplace() { // The easiest way to test adding the icon is via a generated xml, otherwise // we have to somehow insert the address of the server into it. + // Attempts to load a non-image page into an image icon. let engine = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}data/engineMaker.sjs?` + JSON.stringify({ baseURL: gDataUrl, - image: "opensearch/resourceicon.xml", + image: "head_search.js", name: "invalidicon", method: "GET", }), ===================================== toolkit/components/search/tests/xpcshell/test_webextensions_install.js ===================================== @@ -5,6 +5,8 @@ const { promiseShutdownManager, promiseStartupManager } = AddonTestUtils; +let gBaseUrl; + async function getEngineNames() { let engines = await Services.search.getEngines(); return engines.map(engine => engine._name); @@ -13,6 +15,8 @@ async function getEngineNames() { add_task(async function setup() { let server = useHttpServer(); server.registerContentType("sjs", "sjs"); + gBaseUrl = `http://localhost:${server.identity.primaryPort}/`; + await SearchTestUtils.useTestEngines("test-extensions"); await promiseStartupManager(); @@ -132,7 +136,7 @@ add_task(async function test_load_favicon_invalid() { // User installs a new search engine let extension = await SearchTestUtils.installSearchExtension( { - favicon_url: `${gDataUrl}engine.xml`, + favicon_url: `${gBaseUrl}/head_search.js`, }, { skipUnload: true } ); ===================================== toolkit/modules/RemotePageAccessManager.sys.mjs ===================================== @@ -66,6 +66,7 @@ export let RemotePageAccessManager = { }, "about:httpsonlyerror": { RPMGetFormatURLPref: ["app.support.baseURL"], + RPMGetIntPref: ["security.dialog_enable_delay"], RPMSendAsyncMessage: ["goBack", "openInsecure"], RPMAddMessageListener: ["WWWReachable"], RPMTryPingSecureWWWLink: ["*"], View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/78… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/78… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.4.0esr-13.0-1] 7 commits: Bug 1738426 - Ignoring status 206 and vary header checking for opaque response...
by richard (＠richard) 23 Oct '23

23 Oct '23

richard pushed to branch base-browser-115.4.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: b9e4a514 by Eden Chuang at 2023-10-23T12:08:01+00:00 Bug 1738426 - Ignoring status 206 and vary header checking for opaque response in Cache API. r=asuth Differential Revision: https://phabricator.services.mozilla.com/D186431 - - - - - 8c746a06 by edgul at 2023-10-23T12:08:02+00:00 Bug 1802057 - Block the following characters from use in the cookie name in the cookie string: 0x3B (semi-colon), 0x3D (equals), and 0x7F (del) r=dveditz,cookie-reviewers Differential Revision: https://phabricator.services.mozilla.com/D182373 - - - - - 84ccf5cf by Kelsey Gilbert at 2023-10-23T12:08:02+00:00 Bug 1819497 - Don't race on static bool for initialization. r=gfx-reviewers,aosmond We could do non-racy static init here (e.g. with a static initializer self-calling-closure), but there doesn't seem to be a strong reason for this. Let's just use a switch and get robustness from -Werror=switch. Differential Revision: https://phabricator.services.mozilla.com/D188054 - - - - - 86a0bd0a by Mark Banner at 2023-10-23T12:08:03+00:00 Bug 1845752. r=ckerschb Differential Revision: https://phabricator.services.mozilla.com/D186676 - - - - - 20ba1040 by Bob Owen at 2023-10-23T12:08:03+00:00 Bug 1850072: Initialize RecordedDrawTargetCreation::mHasExistingData. r=jrmuizel This also specializes ElementStreamFormat for bool. Differential Revision: https://phabricator.services.mozilla.com/D187794 - - - - - ceefded8 by Malte Juergens at 2023-10-23T12:08:03+00:00 Bug 1850200 - Add delay to HTTPS-Only "Continue to HTTPS Site" button r=freddyb Differential Revision: https://phabricator.services.mozilla.com/D187887 - - - - - a27ce01f by Andreas Pehrson at 2023-10-23T12:08:04+00:00 Bug 1851803 - Introduce SourceMediaTrack::mDirectDisabledMode. r=karlt Similar to MediaTrack::mDisabledMode, but this is for uses on the SourceMediaTrack producer thread. It is still signaled via a control message from the control thread to maintain order of operations, and is protected by the SourceMediaTrack mutex. Differential Revision: https://phabricator.services.mozilla.com/D187554 - - - - - 18 changed files: - dom/cache/TypeUtils.cpp - dom/canvas/WebGLContextExtensions.cpp - dom/media/MediaTrackGraph.cpp - dom/media/MediaTrackGraph.h - gfx/2d/RecordedEventImpl.h - gfx/2d/RecordingTypes.h - netwerk/cookie/CookieCommons.cpp - testing/web-platform/meta/cookies/name/name-ctl.html.ini - − testing/web-platform/meta/service-workers/cache-storage/cache-put.https.any.js.ini - toolkit/components/httpsonlyerror/content/errorpage.html - toolkit/components/httpsonlyerror/content/errorpage.js - toolkit/components/search/OpenSearchEngine.sys.mjs - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/search/SearchUtils.sys.mjs - toolkit/components/search/tests/xpcshell/data/iconsRedirect.sjs - toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js - toolkit/components/search/tests/xpcshell/test_webextensions_install.js - toolkit/modules/RemotePageAccessManager.sys.mjs Changes: ===================================== dom/cache/TypeUtils.cpp ===================================== @@ -184,7 +184,7 @@ void TypeUtils::ToCacheResponseWithoutBody(CacheResponse& aOut, aOut.statusText() = aIn.GetUnfilteredStatusText(); RefPtr<InternalHeaders> headers = aIn.UnfilteredHeaders(); MOZ_DIAGNOSTIC_ASSERT(headers); - if (HasVaryStar(headers)) { + if (aIn.Type() != ResponseType::Opaque && HasVaryStar(headers)) { aRv.ThrowTypeError("Invalid Response object with a 'Vary: *' header."); return; } ===================================== dom/canvas/WebGLContextExtensions.cpp ===================================== @@ -17,15 +17,10 @@ namespace mozilla { const char* GetExtensionName(const WebGLExtensionID ext) { - static EnumeratedArray<WebGLExtensionID, WebGLExtensionID::Max, const char*> - sExtensionNamesEnumeratedArray; - static bool initialized = false; - - if (!initialized) { - initialized = true; - + switch (ext) { #define WEBGL_EXTENSION_IDENTIFIER(x) \ - sExtensionNamesEnumeratedArray[WebGLExtensionID::x] = #x; + case WebGLExtensionID::x: \ + return #x; WEBGL_EXTENSION_IDENTIFIER(ANGLE_instanced_arrays) WEBGL_EXTENSION_IDENTIFIER(EXT_blend_minmax) @@ -67,9 +62,11 @@ const char* GetExtensionName(const WebGLExtensionID ext) { WEBGL_EXTENSION_IDENTIFIER(WEBGL_provoking_vertex) #undef WEBGL_EXTENSION_IDENTIFIER - } - return sExtensionNamesEnumeratedArray[ext]; + case WebGLExtensionID::Max: + break; + } + MOZ_CRASH("bad WebGLExtensionID"); } // ---------------------------- ===================================== dom/media/MediaTrackGraph.cpp ===================================== @@ -145,6 +145,27 @@ class GraphKey final { nsTHashMap<nsGenericHashKey<GraphKey>, MediaTrackGraphImpl*> gGraphs; } // anonymous namespace +static void ApplyTrackDisabling(DisabledTrackMode aDisabledMode, + MediaSegment* aSegment, + MediaSegment* aRawSegment) { + if (aDisabledMode == DisabledTrackMode::ENABLED) { + return; + } + if (aDisabledMode == DisabledTrackMode::SILENCE_BLACK) { + aSegment->ReplaceWithDisabled(); + if (aRawSegment) { + aRawSegment->ReplaceWithDisabled(); + } + } else if (aDisabledMode == DisabledTrackMode::SILENCE_FREEZE) { + aSegment->ReplaceWithNull(); + if (aRawSegment) { + aRawSegment->ReplaceWithNull(); + } + } else { + MOZ_CRASH("Unsupported mode"); + } +} + MediaTrackGraphImpl::~MediaTrackGraphImpl() { MOZ_ASSERT(mTracks.IsEmpty() && mSuspendedTracks.IsEmpty(), "All tracks should have been destroyed by messages from the main " @@ -2421,6 +2442,7 @@ RefPtr<GenericPromise> MediaTrack::RemoveListener( void MediaTrack::AddDirectListenerImpl( already_AddRefed<DirectMediaTrackListener> aListener) { + MOZ_ASSERT(mGraph->OnGraphThread()); // Base implementation, for tracks that don't support direct track listeners. RefPtr<DirectMediaTrackListener> listener = aListener; listener->NotifyDirectListenerInstalled( @@ -2503,6 +2525,7 @@ void MediaTrack::RunAfterPendingUpdates( } void MediaTrack::SetDisabledTrackModeImpl(DisabledTrackMode aMode) { + MOZ_ASSERT(mGraph->OnGraphThread()); MOZ_DIAGNOSTIC_ASSERT( aMode == DisabledTrackMode::ENABLED || mDisabledMode == DisabledTrackMode::ENABLED, @@ -2531,22 +2554,8 @@ void MediaTrack::SetDisabledTrackMode(DisabledTrackMode aMode) { void MediaTrack::ApplyTrackDisabling(MediaSegment* aSegment, MediaSegment* aRawSegment) { - if (mDisabledMode == DisabledTrackMode::ENABLED) { - return; - } - if (mDisabledMode == DisabledTrackMode::SILENCE_BLACK) { - aSegment->ReplaceWithDisabled(); - if (aRawSegment) { - aRawSegment->ReplaceWithDisabled(); - } - } else if (mDisabledMode == DisabledTrackMode::SILENCE_FREEZE) { - aSegment->ReplaceWithNull(); - if (aRawSegment) { - aRawSegment->ReplaceWithNull(); - } - } else { - MOZ_CRASH("Unsupported mode"); - } + MOZ_ASSERT(mGraph->OnGraphThread()); + mozilla::ApplyTrackDisabling(mDisabledMode, aSegment, aRawSegment); } void MediaTrack::AddMainThreadListener( @@ -2866,7 +2875,7 @@ TrackTime SourceMediaTrack::AppendData(MediaSegment* aSegment, // Apply track disabling before notifying any consumers directly // or inserting into the graph - ApplyTrackDisabling(aSegment, aRawSegment); + mozilla::ApplyTrackDisabling(mDirectDisabledMode, aSegment, aRawSegment); ResampleAudioToGraphSampleRate(aSegment); @@ -2910,6 +2919,7 @@ void SourceMediaTrack::NotifyDirectConsumers(MediaSegment* aSegment) { void SourceMediaTrack::AddDirectListenerImpl( already_AddRefed<DirectMediaTrackListener> aListener) { + MOZ_ASSERT(mGraph->OnGraphThread()); MutexAutoLock lock(mMutex); RefPtr<DirectMediaTrackListener> listener = aListener; @@ -2979,6 +2989,7 @@ void SourceMediaTrack::AddDirectListenerImpl( void SourceMediaTrack::RemoveDirectListenerImpl( DirectMediaTrackListener* aListener) { + mGraph->AssertOnGraphThreadOrNotRunning(); MutexAutoLock lock(mMutex); for (int32_t i = mDirectTrackListeners.Length() - 1; i >= 0; --i) { const RefPtr<DirectMediaTrackListener>& l = mDirectTrackListeners[i]; @@ -3008,17 +3019,20 @@ void SourceMediaTrack::End() { } void SourceMediaTrack::SetDisabledTrackModeImpl(DisabledTrackMode aMode) { + MOZ_ASSERT(mGraph->OnGraphThread()); { MutexAutoLock lock(mMutex); + const DisabledTrackMode oldMode = mDirectDisabledMode; + const bool oldEnabled = oldMode == DisabledTrackMode::ENABLED; + const bool enabled = aMode == DisabledTrackMode::ENABLED; + mDirectDisabledMode = aMode; for (const auto& l : mDirectTrackListeners) { - DisabledTrackMode oldMode = mDisabledMode; - bool oldEnabled = oldMode == DisabledTrackMode::ENABLED; - if (!oldEnabled && aMode == DisabledTrackMode::ENABLED) { + if (!oldEnabled && enabled) { LOG(LogLevel::Debug, ("%p: SourceMediaTrack %p setting " "direct listener enabled", GraphImpl(), this)); l->DecreaseDisabled(oldMode); - } else if (oldEnabled && aMode != DisabledTrackMode::ENABLED) { + } else if (oldEnabled && !enabled) { LOG(LogLevel::Debug, ("%p: SourceMediaTrack %p setting " "direct listener disabled", GraphImpl(), this)); ===================================== dom/media/MediaTrackGraph.h ===================================== @@ -652,18 +652,8 @@ class SourceMediaTrack : public MediaTrack { */ void End(); - // Overriding allows us to hold the mMutex lock while changing the track - // enable status void SetDisabledTrackModeImpl(DisabledTrackMode aMode) override; - // Overriding allows us to ensure mMutex is locked while changing the track - // enable status - void ApplyTrackDisabling(MediaSegment* aSegment, - MediaSegment* aRawSegment = nullptr) override { - mMutex.AssertCurrentThreadOwns(); - MediaTrack::ApplyTrackDisabling(aSegment, aRawSegment); - } - uint32_t NumberOfChannels() const override; void RemoveAllDirectListenersImpl() override; @@ -742,6 +732,11 @@ class SourceMediaTrack : public MediaTrack { // protected by mMutex float mVolume MOZ_GUARDED_BY(mMutex) = 1.0; UniquePtr<TrackData> mUpdateTrack MOZ_GUARDED_BY(mMutex); + // This track's associated disabled mode for uses on the producing thread. + // It can either by disabled by frames being replaced by black, or by + // retaining the previous frame. + DisabledTrackMode mDirectDisabledMode MOZ_GUARDED_BY(mMutex) = + DisabledTrackMode::ENABLED; nsTArray<RefPtr<DirectMediaTrackListener>> mDirectTrackListeners MOZ_GUARDED_BY(mMutex); }; ===================================== gfx/2d/RecordedEventImpl.h ===================================== @@ -65,7 +65,7 @@ class RecordedDrawTargetCreation BackendType mBackendType; IntRect mRect; SurfaceFormat mFormat; - bool mHasExistingData; + bool mHasExistingData = false; RefPtr<SourceSurface> mExistingData; private: ===================================== gfx/2d/RecordingTypes.h ===================================== @@ -24,6 +24,28 @@ struct ElementStreamFormat { aStream.read(reinterpret_cast<char*>(&aElement), sizeof(T)); } }; +template <class S> +struct ElementStreamFormat<S, bool> { + static void Write(S& aStream, const bool& aElement) { + char boolChar = aElement ? '\x01' : '\x00'; + aStream.write(&boolChar, sizeof(boolChar)); + } + static void Read(S& aStream, bool& aElement) { + char boolChar; + aStream.read(&boolChar, sizeof(boolChar)); + switch (boolChar) { + case '\x00': + aElement = false; + break; + case '\x01': + aElement = true; + break; + default: + aStream.SetIsBad(); + break; + } + } +}; template <class S, class T> void WriteElement(S& aStream, const T& aElement) { ===================================== netwerk/cookie/CookieCommons.cpp ===================================== @@ -200,9 +200,9 @@ bool CookieCommons::CheckNameAndValueSize(const CookieStruct& aCookieData) { bool CookieCommons::CheckName(const CookieStruct& aCookieData) { const char illegalNameCharacters[] = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, - 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, - 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x00}; + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, + 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, + 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x3B, 0x3D, 0x7F, 0x00}; const auto* start = aCookieData.name().BeginReading(); const auto* end = aCookieData.name().EndReading(); ===================================== testing/web-platform/meta/cookies/name/name-ctl.html.ini ===================================== @@ -11,36 +11,6 @@ [Cookie with %xd in name is rejected (DOM).] expected: FAIL - [Cookie with %x7f in name is rejected (DOM).] - expected: FAIL - - [Cookie with %x0 in name is rejected or modified (HTTP).] - expected: FAIL - - [Cookie with %x1 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x2 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x3 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x4 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x5 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x6 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x7 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x8 in name is rejected (HTTP).] - expected: FAIL - [Cookie with %x9 in name is accepted (HTTP).] expected: FAIL ===================================== testing/web-platform/meta/service-workers/cache-storage/cache-put.https.any.js.ini deleted ===================================== @@ -1,26 +0,0 @@ -[cache-put.https.any.serviceworker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.sharedworker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.worker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL ===================================== toolkit/components/httpsonlyerror/content/errorpage.html ===================================== @@ -67,6 +67,7 @@ <button id="openInsecure" data-l10n-id="about-httpsonly-button-continue-to-site" + inert ></button> </div> <div class="suggestion-box" hidden> ===================================== toolkit/components/httpsonlyerror/content/errorpage.js ===================================== @@ -34,6 +34,11 @@ function initPage() { .getElementById("openInsecure") .addEventListener("click", onOpenInsecureButtonClick); + const delay = RPMGetIntPref("security.dialog_enable_delay", 1000); + setTimeout(() => { + document.getElementById("openInsecure").removeAttribute("inert"); + }, delay); + if (window.top == window) { document .getElementById("goBack") ===================================== toolkit/components/search/OpenSearchEngine.sys.mjs ===================================== @@ -144,7 +144,12 @@ export class OpenSearchEngine extends SearchEngine { lazy.logConsole.debug("_install: Downloading engine from:", loadURI.spec); - var chan = lazy.SearchUtils.makeChannel(loadURI); + var chan = lazy.SearchUtils.makeChannel( + loadURI, + // OpenSearchEngine is loading a definition file for a search engine, + // TYPE_DOCUMENT captures that load best + Ci.nsIContentPolicy.TYPE_DOCUMENT + ); if (this._engineToUpdate && chan instanceof Ci.nsIHttpChannel) { var lastModified = this._engineToUpdate.getAttr("updatelastmodified"); ===================================== toolkit/components/search/SearchEngine.sys.mjs ===================================== @@ -821,7 +821,10 @@ export class SearchEngine { this._hasPreferredIcon = isPreferred; }; - let chan = lazy.SearchUtils.makeChannel(uri); + let chan = lazy.SearchUtils.makeChannel( + uri, + Ci.nsIContentPolicy.TYPE_IMAGE + ); let listener = new lazy.SearchUtils.LoadListener( chan, /^image\//, ===================================== toolkit/components/search/SearchUtils.sys.mjs ===================================== @@ -248,19 +248,24 @@ export var SearchUtils = { * * @param {string|nsIURI} url * The URL string from which to create an nsIChannel. + * @param {nsIContentPolicy} contentPolicyType + * The type of document being loaded. * @returns {nsIChannel} * an nsIChannel object, or null if the url is invalid. */ - makeChannel(url) { + makeChannel(url, contentPolicyType) { + if (!contentPolicyType) { + throw new Error("makeChannel called with invalid content policy type"); + } try { let uri = typeof url == "string" ? Services.io.newURI(url) : url; return Services.io.newChannelFromURI( uri, null /* loadingNode */, - Services.scriptSecurityManager.getSystemPrincipal(), + Services.scriptSecurityManager.createNullPrincipal({}), null /* triggeringPrincipal */, Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL, - Ci.nsIContentPolicy.TYPE_OTHER + contentPolicyType ); } catch (ex) {} ===================================== toolkit/components/search/tests/xpcshell/data/iconsRedirect.sjs ===================================== @@ -10,7 +10,7 @@ function handleRequest(request, response) { response.setStatusLine("1.1", 302, "Moved"); if (request.queryString == "type=invalid") { response.setHeader("Content-Type", "image/png", false); - response.setHeader("Location", "engine.xml", false); + response.setHeader("Location", "/head_search.js", false); } else { response.setHeader("Content-Type", "text/html", false); response.setHeader("Location", "remoteIcon.ico", false); ===================================== toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js ===================================== @@ -12,9 +12,11 @@ add_task(async function setup() { }); add_task(async function test_installedresourceicon() { + // Attempts to load a resource:// url as an icon. let engine1 = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}opensearch/resourceicon.xml`, }); + // Attempts to load a chrome:// url as an icon. let engine2 = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}opensearch/chromeicon.xml`, }); @@ -32,12 +34,13 @@ add_task(async function test_installedhttpplace() { // The easiest way to test adding the icon is via a generated xml, otherwise // we have to somehow insert the address of the server into it. + // Attempts to load a non-image page into an image icon. let engine = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}data/engineMaker.sjs?` + JSON.stringify({ baseURL: gDataUrl, - image: "opensearch/resourceicon.xml", + image: "head_search.js", name: "invalidicon", method: "GET", }), ===================================== toolkit/components/search/tests/xpcshell/test_webextensions_install.js ===================================== @@ -5,6 +5,8 @@ const { promiseShutdownManager, promiseStartupManager } = AddonTestUtils; +let gBaseUrl; + async function getEngineNames() { let engines = await Services.search.getEngines(); return engines.map(engine => engine._name); @@ -13,6 +15,8 @@ async function getEngineNames() { add_task(async function setup() { let server = useHttpServer(); server.registerContentType("sjs", "sjs"); + gBaseUrl = `http://localhost:${server.identity.primaryPort}/`; + await SearchTestUtils.useTestEngines("test-extensions"); await promiseStartupManager(); @@ -132,7 +136,7 @@ add_task(async function test_load_favicon_invalid() { // User installs a new search engine let extension = await SearchTestUtils.installSearchExtension( { - favicon_url: `${gDataUrl}engine.xml`, + favicon_url: `${gBaseUrl}/head_search.js`, }, { skipUnload: true } ); ===================================== toolkit/modules/RemotePageAccessManager.sys.mjs ===================================== @@ -66,6 +66,7 @@ export let RemotePageAccessManager = { }, "about:httpsonlyerror": { RPMGetFormatURLPref: ["app.support.baseURL"], + RPMGetIntPref: ["security.dialog_enable_delay"], RPMSendAsyncMessage: ["goBack", "openInsecure"], RPMAddMessageListener: ["WWWReachable"], RPMTryPingSecureWWWLink: ["*"], View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a78a91… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a78a91… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.4.0esr-13.0-1] 8 commits: Bug 1738426 - Ignoring status 206 and vary header checking for opaque response...
by richard (＠richard) 23 Oct '23

23 Oct '23

richard pushed to branch tor-browser-115.4.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 2abd55fd by Eden Chuang at 2023-10-21T19:53:08+02:00 Bug 1738426 - Ignoring status 206 and vary header checking for opaque response in Cache API. r=asuth Differential Revision: https://phabricator.services.mozilla.com/D186431 - - - - - 9935a5d2 by edgul at 2023-10-21T20:19:27+02:00 Bug 1802057 - Block the following characters from use in the cookie name in the cookie string: 0x3B (semi-colon), 0x3D (equals), and 0x7F (del) r=dveditz,cookie-reviewers Differential Revision: https://phabricator.services.mozilla.com/D182373 - - - - - 17f51380 by Kelsey Gilbert at 2023-10-21T20:26:18+02:00 Bug 1819497 - Don't race on static bool for initialization. r=gfx-reviewers,aosmond We could do non-racy static init here (e.g. with a static initializer self-calling-closure), but there doesn't seem to be a strong reason for this. Let's just use a switch and get robustness from -Werror=switch. Differential Revision: https://phabricator.services.mozilla.com/D188054 - - - - - 220260c4 by Mark Banner at 2023-10-21T20:56:11+02:00 Bug 1845752. r=ckerschb Differential Revision: https://phabricator.services.mozilla.com/D186676 - - - - - 12d376c9 by Bob Owen at 2023-10-21T21:02:12+02:00 Bug 1850072: Initialize RecordedDrawTargetCreation::mHasExistingData. r=jrmuizel This also specializes ElementStreamFormat for bool. Differential Revision: https://phabricator.services.mozilla.com/D187794 - - - - - 2488f011 by Malte Juergens at 2023-10-21T21:24:39+02:00 Bug 1850200 - Add delay to HTTPS-Only "Continue to HTTPS Site" button r=freddyb Differential Revision: https://phabricator.services.mozilla.com/D187887 - - - - - 523a7efe by Andreas Pehrson at 2023-10-21T21:42:20+02:00 Bug 1851803 - Introduce SourceMediaTrack::mDirectDisabledMode. r=karlt Similar to MediaTrack::mDisabledMode, but this is for uses on the SourceMediaTrack producer thread. It is still signaled via a control message from the control thread to maintain order of operations, and is protected by the SourceMediaTrack mutex. Differential Revision: https://phabricator.services.mozilla.com/D187554 - - - - - c932accf by richard at 2023-10-23T11:42:18+00:00 Merge branch 'bug42191-confidential-issue' into 'tor-browser-115.4.0esr-13.0-1' Bug 42191: backports from 119 to esr115 See merge request ma1/tor-browser-confidential!4 - - - - - 18 changed files: - dom/cache/TypeUtils.cpp - dom/canvas/WebGLContextExtensions.cpp - dom/media/MediaTrackGraph.cpp - dom/media/MediaTrackGraph.h - gfx/2d/RecordedEventImpl.h - gfx/2d/RecordingTypes.h - netwerk/cookie/CookieCommons.cpp - testing/web-platform/meta/cookies/name/name-ctl.html.ini - − testing/web-platform/meta/service-workers/cache-storage/cache-put.https.any.js.ini - toolkit/components/httpsonlyerror/content/errorpage.html - toolkit/components/httpsonlyerror/content/errorpage.js - toolkit/components/search/OpenSearchEngine.sys.mjs - toolkit/components/search/SearchEngine.sys.mjs - toolkit/components/search/SearchUtils.sys.mjs - toolkit/components/search/tests/xpcshell/data/iconsRedirect.sjs - toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js - toolkit/components/search/tests/xpcshell/test_webextensions_install.js - toolkit/modules/RemotePageAccessManager.sys.mjs Changes: ===================================== dom/cache/TypeUtils.cpp ===================================== @@ -184,7 +184,7 @@ void TypeUtils::ToCacheResponseWithoutBody(CacheResponse& aOut, aOut.statusText() = aIn.GetUnfilteredStatusText(); RefPtr<InternalHeaders> headers = aIn.UnfilteredHeaders(); MOZ_DIAGNOSTIC_ASSERT(headers); - if (HasVaryStar(headers)) { + if (aIn.Type() != ResponseType::Opaque && HasVaryStar(headers)) { aRv.ThrowTypeError("Invalid Response object with a 'Vary: *' header."); return; } ===================================== dom/canvas/WebGLContextExtensions.cpp ===================================== @@ -17,15 +17,10 @@ namespace mozilla { const char* GetExtensionName(const WebGLExtensionID ext) { - static EnumeratedArray<WebGLExtensionID, WebGLExtensionID::Max, const char*> - sExtensionNamesEnumeratedArray; - static bool initialized = false; - - if (!initialized) { - initialized = true; - + switch (ext) { #define WEBGL_EXTENSION_IDENTIFIER(x) \ - sExtensionNamesEnumeratedArray[WebGLExtensionID::x] = #x; + case WebGLExtensionID::x: \ + return #x; WEBGL_EXTENSION_IDENTIFIER(ANGLE_instanced_arrays) WEBGL_EXTENSION_IDENTIFIER(EXT_blend_minmax) @@ -67,9 +62,11 @@ const char* GetExtensionName(const WebGLExtensionID ext) { WEBGL_EXTENSION_IDENTIFIER(WEBGL_provoking_vertex) #undef WEBGL_EXTENSION_IDENTIFIER - } - return sExtensionNamesEnumeratedArray[ext]; + case WebGLExtensionID::Max: + break; + } + MOZ_CRASH("bad WebGLExtensionID"); } // ---------------------------- ===================================== dom/media/MediaTrackGraph.cpp ===================================== @@ -145,6 +145,27 @@ class GraphKey final { nsTHashMap<nsGenericHashKey<GraphKey>, MediaTrackGraphImpl*> gGraphs; } // anonymous namespace +static void ApplyTrackDisabling(DisabledTrackMode aDisabledMode, + MediaSegment* aSegment, + MediaSegment* aRawSegment) { + if (aDisabledMode == DisabledTrackMode::ENABLED) { + return; + } + if (aDisabledMode == DisabledTrackMode::SILENCE_BLACK) { + aSegment->ReplaceWithDisabled(); + if (aRawSegment) { + aRawSegment->ReplaceWithDisabled(); + } + } else if (aDisabledMode == DisabledTrackMode::SILENCE_FREEZE) { + aSegment->ReplaceWithNull(); + if (aRawSegment) { + aRawSegment->ReplaceWithNull(); + } + } else { + MOZ_CRASH("Unsupported mode"); + } +} + MediaTrackGraphImpl::~MediaTrackGraphImpl() { MOZ_ASSERT(mTracks.IsEmpty() && mSuspendedTracks.IsEmpty(), "All tracks should have been destroyed by messages from the main " @@ -2421,6 +2442,7 @@ RefPtr<GenericPromise> MediaTrack::RemoveListener( void MediaTrack::AddDirectListenerImpl( already_AddRefed<DirectMediaTrackListener> aListener) { + MOZ_ASSERT(mGraph->OnGraphThread()); // Base implementation, for tracks that don't support direct track listeners. RefPtr<DirectMediaTrackListener> listener = aListener; listener->NotifyDirectListenerInstalled( @@ -2503,6 +2525,7 @@ void MediaTrack::RunAfterPendingUpdates( } void MediaTrack::SetDisabledTrackModeImpl(DisabledTrackMode aMode) { + MOZ_ASSERT(mGraph->OnGraphThread()); MOZ_DIAGNOSTIC_ASSERT( aMode == DisabledTrackMode::ENABLED || mDisabledMode == DisabledTrackMode::ENABLED, @@ -2531,22 +2554,8 @@ void MediaTrack::SetDisabledTrackMode(DisabledTrackMode aMode) { void MediaTrack::ApplyTrackDisabling(MediaSegment* aSegment, MediaSegment* aRawSegment) { - if (mDisabledMode == DisabledTrackMode::ENABLED) { - return; - } - if (mDisabledMode == DisabledTrackMode::SILENCE_BLACK) { - aSegment->ReplaceWithDisabled(); - if (aRawSegment) { - aRawSegment->ReplaceWithDisabled(); - } - } else if (mDisabledMode == DisabledTrackMode::SILENCE_FREEZE) { - aSegment->ReplaceWithNull(); - if (aRawSegment) { - aRawSegment->ReplaceWithNull(); - } - } else { - MOZ_CRASH("Unsupported mode"); - } + MOZ_ASSERT(mGraph->OnGraphThread()); + mozilla::ApplyTrackDisabling(mDisabledMode, aSegment, aRawSegment); } void MediaTrack::AddMainThreadListener( @@ -2866,7 +2875,7 @@ TrackTime SourceMediaTrack::AppendData(MediaSegment* aSegment, // Apply track disabling before notifying any consumers directly // or inserting into the graph - ApplyTrackDisabling(aSegment, aRawSegment); + mozilla::ApplyTrackDisabling(mDirectDisabledMode, aSegment, aRawSegment); ResampleAudioToGraphSampleRate(aSegment); @@ -2910,6 +2919,7 @@ void SourceMediaTrack::NotifyDirectConsumers(MediaSegment* aSegment) { void SourceMediaTrack::AddDirectListenerImpl( already_AddRefed<DirectMediaTrackListener> aListener) { + MOZ_ASSERT(mGraph->OnGraphThread()); MutexAutoLock lock(mMutex); RefPtr<DirectMediaTrackListener> listener = aListener; @@ -2979,6 +2989,7 @@ void SourceMediaTrack::AddDirectListenerImpl( void SourceMediaTrack::RemoveDirectListenerImpl( DirectMediaTrackListener* aListener) { + mGraph->AssertOnGraphThreadOrNotRunning(); MutexAutoLock lock(mMutex); for (int32_t i = mDirectTrackListeners.Length() - 1; i >= 0; --i) { const RefPtr<DirectMediaTrackListener>& l = mDirectTrackListeners[i]; @@ -3008,17 +3019,20 @@ void SourceMediaTrack::End() { } void SourceMediaTrack::SetDisabledTrackModeImpl(DisabledTrackMode aMode) { + MOZ_ASSERT(mGraph->OnGraphThread()); { MutexAutoLock lock(mMutex); + const DisabledTrackMode oldMode = mDirectDisabledMode; + const bool oldEnabled = oldMode == DisabledTrackMode::ENABLED; + const bool enabled = aMode == DisabledTrackMode::ENABLED; + mDirectDisabledMode = aMode; for (const auto& l : mDirectTrackListeners) { - DisabledTrackMode oldMode = mDisabledMode; - bool oldEnabled = oldMode == DisabledTrackMode::ENABLED; - if (!oldEnabled && aMode == DisabledTrackMode::ENABLED) { + if (!oldEnabled && enabled) { LOG(LogLevel::Debug, ("%p: SourceMediaTrack %p setting " "direct listener enabled", GraphImpl(), this)); l->DecreaseDisabled(oldMode); - } else if (oldEnabled && aMode != DisabledTrackMode::ENABLED) { + } else if (oldEnabled && !enabled) { LOG(LogLevel::Debug, ("%p: SourceMediaTrack %p setting " "direct listener disabled", GraphImpl(), this)); ===================================== dom/media/MediaTrackGraph.h ===================================== @@ -652,18 +652,8 @@ class SourceMediaTrack : public MediaTrack { */ void End(); - // Overriding allows us to hold the mMutex lock while changing the track - // enable status void SetDisabledTrackModeImpl(DisabledTrackMode aMode) override; - // Overriding allows us to ensure mMutex is locked while changing the track - // enable status - void ApplyTrackDisabling(MediaSegment* aSegment, - MediaSegment* aRawSegment = nullptr) override { - mMutex.AssertCurrentThreadOwns(); - MediaTrack::ApplyTrackDisabling(aSegment, aRawSegment); - } - uint32_t NumberOfChannels() const override; void RemoveAllDirectListenersImpl() override; @@ -742,6 +732,11 @@ class SourceMediaTrack : public MediaTrack { // protected by mMutex float mVolume MOZ_GUARDED_BY(mMutex) = 1.0; UniquePtr<TrackData> mUpdateTrack MOZ_GUARDED_BY(mMutex); + // This track's associated disabled mode for uses on the producing thread. + // It can either by disabled by frames being replaced by black, or by + // retaining the previous frame. + DisabledTrackMode mDirectDisabledMode MOZ_GUARDED_BY(mMutex) = + DisabledTrackMode::ENABLED; nsTArray<RefPtr<DirectMediaTrackListener>> mDirectTrackListeners MOZ_GUARDED_BY(mMutex); }; ===================================== gfx/2d/RecordedEventImpl.h ===================================== @@ -65,7 +65,7 @@ class RecordedDrawTargetCreation BackendType mBackendType; IntRect mRect; SurfaceFormat mFormat; - bool mHasExistingData; + bool mHasExistingData = false; RefPtr<SourceSurface> mExistingData; private: ===================================== gfx/2d/RecordingTypes.h ===================================== @@ -24,6 +24,28 @@ struct ElementStreamFormat { aStream.read(reinterpret_cast<char*>(&aElement), sizeof(T)); } }; +template <class S> +struct ElementStreamFormat<S, bool> { + static void Write(S& aStream, const bool& aElement) { + char boolChar = aElement ? '\x01' : '\x00'; + aStream.write(&boolChar, sizeof(boolChar)); + } + static void Read(S& aStream, bool& aElement) { + char boolChar; + aStream.read(&boolChar, sizeof(boolChar)); + switch (boolChar) { + case '\x00': + aElement = false; + break; + case '\x01': + aElement = true; + break; + default: + aStream.SetIsBad(); + break; + } + } +}; template <class S, class T> void WriteElement(S& aStream, const T& aElement) { ===================================== netwerk/cookie/CookieCommons.cpp ===================================== @@ -200,9 +200,9 @@ bool CookieCommons::CheckNameAndValueSize(const CookieStruct& aCookieData) { bool CookieCommons::CheckName(const CookieStruct& aCookieData) { const char illegalNameCharacters[] = { - 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, - 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, - 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x00}; + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, + 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, + 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x3B, 0x3D, 0x7F, 0x00}; const auto* start = aCookieData.name().BeginReading(); const auto* end = aCookieData.name().EndReading(); ===================================== testing/web-platform/meta/cookies/name/name-ctl.html.ini ===================================== @@ -11,36 +11,6 @@ [Cookie with %xd in name is rejected (DOM).] expected: FAIL - [Cookie with %x7f in name is rejected (DOM).] - expected: FAIL - - [Cookie with %x0 in name is rejected or modified (HTTP).] - expected: FAIL - - [Cookie with %x1 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x2 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x3 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x4 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x5 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x6 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x7 in name is rejected (HTTP).] - expected: FAIL - - [Cookie with %x8 in name is rejected (HTTP).] - expected: FAIL - [Cookie with %x9 in name is accepted (HTTP).] expected: FAIL ===================================== testing/web-platform/meta/service-workers/cache-storage/cache-put.https.any.js.ini deleted ===================================== @@ -1,26 +0,0 @@ -[cache-put.https.any.serviceworker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.sharedworker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL - - -[cache-put.https.any.worker.html] - expected: - if (os == "android") and fission: [OK, TIMEOUT] - [Cache.put with a VARY:* opaque response should not reject] - expected: FAIL ===================================== toolkit/components/httpsonlyerror/content/errorpage.html ===================================== @@ -67,6 +67,7 @@ <button id="openInsecure" data-l10n-id="about-httpsonly-button-continue-to-site" + inert ></button> </div> <div class="suggestion-box" hidden> ===================================== toolkit/components/httpsonlyerror/content/errorpage.js ===================================== @@ -34,6 +34,11 @@ function initPage() { .getElementById("openInsecure") .addEventListener("click", onOpenInsecureButtonClick); + const delay = RPMGetIntPref("security.dialog_enable_delay", 1000); + setTimeout(() => { + document.getElementById("openInsecure").removeAttribute("inert"); + }, delay); + if (window.top == window) { document .getElementById("goBack") ===================================== toolkit/components/search/OpenSearchEngine.sys.mjs ===================================== @@ -144,7 +144,12 @@ export class OpenSearchEngine extends SearchEngine { lazy.logConsole.debug("_install: Downloading engine from:", loadURI.spec); - var chan = lazy.SearchUtils.makeChannel(loadURI); + var chan = lazy.SearchUtils.makeChannel( + loadURI, + // OpenSearchEngine is loading a definition file for a search engine, + // TYPE_DOCUMENT captures that load best + Ci.nsIContentPolicy.TYPE_DOCUMENT + ); if (this._engineToUpdate && chan instanceof Ci.nsIHttpChannel) { var lastModified = this._engineToUpdate.getAttr("updatelastmodified"); ===================================== toolkit/components/search/SearchEngine.sys.mjs ===================================== @@ -821,7 +821,10 @@ export class SearchEngine { this._hasPreferredIcon = isPreferred; }; - let chan = lazy.SearchUtils.makeChannel(uri); + let chan = lazy.SearchUtils.makeChannel( + uri, + Ci.nsIContentPolicy.TYPE_IMAGE + ); let listener = new lazy.SearchUtils.LoadListener( chan, /^image\//, ===================================== toolkit/components/search/SearchUtils.sys.mjs ===================================== @@ -248,19 +248,24 @@ export var SearchUtils = { * * @param {string|nsIURI} url * The URL string from which to create an nsIChannel. + * @param {nsIContentPolicy} contentPolicyType + * The type of document being loaded. * @returns {nsIChannel} * an nsIChannel object, or null if the url is invalid. */ - makeChannel(url) { + makeChannel(url, contentPolicyType) { + if (!contentPolicyType) { + throw new Error("makeChannel called with invalid content policy type"); + } try { let uri = typeof url == "string" ? Services.io.newURI(url) : url; return Services.io.newChannelFromURI( uri, null /* loadingNode */, - Services.scriptSecurityManager.getSystemPrincipal(), + Services.scriptSecurityManager.createNullPrincipal({}), null /* triggeringPrincipal */, Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL, - Ci.nsIContentPolicy.TYPE_OTHER + contentPolicyType ); } catch (ex) {} ===================================== toolkit/components/search/tests/xpcshell/data/iconsRedirect.sjs ===================================== @@ -10,7 +10,7 @@ function handleRequest(request, response) { response.setStatusLine("1.1", 302, "Moved"); if (request.queryString == "type=invalid") { response.setHeader("Content-Type", "image/png", false); - response.setHeader("Location", "engine.xml", false); + response.setHeader("Location", "/head_search.js", false); } else { response.setHeader("Content-Type", "text/html", false); response.setHeader("Location", "remoteIcon.ico", false); ===================================== toolkit/components/search/tests/xpcshell/test_opensearch_icons_invalid.js ===================================== @@ -12,9 +12,11 @@ add_task(async function setup() { }); add_task(async function test_installedresourceicon() { + // Attempts to load a resource:// url as an icon. let engine1 = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}opensearch/resourceicon.xml`, }); + // Attempts to load a chrome:// url as an icon. let engine2 = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}opensearch/chromeicon.xml`, }); @@ -32,12 +34,13 @@ add_task(async function test_installedhttpplace() { // The easiest way to test adding the icon is via a generated xml, otherwise // we have to somehow insert the address of the server into it. + // Attempts to load a non-image page into an image icon. let engine = await SearchTestUtils.promiseNewSearchEngine({ url: `${gDataUrl}data/engineMaker.sjs?` + JSON.stringify({ baseURL: gDataUrl, - image: "opensearch/resourceicon.xml", + image: "head_search.js", name: "invalidicon", method: "GET", }), ===================================== toolkit/components/search/tests/xpcshell/test_webextensions_install.js ===================================== @@ -5,6 +5,8 @@ const { promiseShutdownManager, promiseStartupManager } = AddonTestUtils; +let gBaseUrl; + async function getEngineNames() { let engines = await Services.search.getEngines(); return engines.map(engine => engine._name); @@ -13,6 +15,8 @@ async function getEngineNames() { add_task(async function setup() { let server = useHttpServer(); server.registerContentType("sjs", "sjs"); + gBaseUrl = `http://localhost:${server.identity.primaryPort}/`; + await SearchTestUtils.useTestEngines("test-extensions"); await promiseStartupManager(); @@ -132,7 +136,7 @@ add_task(async function test_load_favicon_invalid() { // User installs a new search engine let extension = await SearchTestUtils.installSearchExtension( { - favicon_url: `${gDataUrl}engine.xml`, + favicon_url: `${gBaseUrl}/head_search.js`, }, { skipUnload: true } ); ===================================== toolkit/modules/RemotePageAccessManager.sys.mjs ===================================== @@ -66,6 +66,7 @@ export let RemotePageAccessManager = { }, "about:httpsonlyerror": { RPMGetFormatURLPref: ["app.support.baseURL"], + RPMGetIntPref: ["security.dialog_enable_delay"], RPMSendAsyncMessage: ["goBack", "openInsecure"], RPMAddMessageListener: ["WWWReachable"], RPMTryPingSecureWWWLink: ["*"], View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/466147… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/466147… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.4.0esr-13.0-1] fixup! Bug 40926: Implemented the New Identity feature
by ma1 (＠ma1) 20 Oct '23

20 Oct '23

ma1 pushed to branch mullvad-browser-115.4.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 7898b29a by hackademix at 2023-10-20T15:46:41+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42182: avoid reloading any search engine extension. - - - - - 1 changed file: - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -415,10 +415,13 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { async reloadAddons() { logger.info("Reloading add-ons to clear their temporary state."); // Reload all active extensions except search engines, which would throw. - const addons = ( - await AddonManager.getAddonsByTypes(["extension"]) - ).filter(a => a.isActive && !a.id.endsWith("@search.mozilla.org")); - await Promise.all(addons.map(a => a.reload())); + const addons = await AddonManager.getAddonsByTypes(["extension"]); + const isSearchEngine = async addon => + (await (await fetch(addon.getResourceURI("manifest.json").spec)).json()) + ?.chrome_settings_overrides?.search_provider; + const reloadIfNeeded = async addon => + addon.isActive && !(await isSearchEngine(addon)) && addon.reload(); + await Promise.all(addons.map(addon => reloadIfNeeded(addon))); } // Broadcast as a hook to clear other data View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/789… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/789… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.4.0esr-13.0-1] fixup! Bug 40926: Implemented the New Identity feature
by ma1 (＠ma1) 20 Oct '23

20 Oct '23

ma1 pushed to branch base-browser-115.4.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: a78a919d by hackademix at 2023-10-20T15:45:50+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42182: avoid reloading any search engine extension. - - - - - 1 changed file: - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -415,10 +415,13 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { async reloadAddons() { logger.info("Reloading add-ons to clear their temporary state."); // Reload all active extensions except search engines, which would throw. - const addons = ( - await AddonManager.getAddonsByTypes(["extension"]) - ).filter(a => a.isActive && !a.id.endsWith("@search.mozilla.org")); - await Promise.all(addons.map(a => a.reload())); + const addons = await AddonManager.getAddonsByTypes(["extension"]); + const isSearchEngine = async addon => + (await (await fetch(addon.getResourceURI("manifest.json").spec)).json()) + ?.chrome_settings_overrides?.search_provider; + const reloadIfNeeded = async addon => + addon.isActive && !(await isSearchEngine(addon)) && addon.reload(); + await Promise.all(addons.map(addon => reloadIfNeeded(addon))); } // Broadcast as a hook to clear other data View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a78a919… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a78a919… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.4.0esr-13.0-1] fixup! Bug 40926: Implemented the New Identity feature
by ma1 (＠ma1) 20 Oct '23

20 Oct '23

ma1 pushed to branch tor-browser-115.4.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 46614757 by hackademix at 2023-10-20T15:38:29+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42182: avoid reloading any search engine extension. - - - - - 1 changed file: - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -415,10 +415,13 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { async reloadAddons() { logger.info("Reloading add-ons to clear their temporary state."); // Reload all active extensions except search engines, which would throw. - const addons = ( - await AddonManager.getAddonsByTypes(["extension"]) - ).filter(a => a.isActive && !a.id.endsWith("@search.mozilla.org")); - await Promise.all(addons.map(a => a.reload())); + const addons = await AddonManager.getAddonsByTypes(["extension"]); + const isSearchEngine = async addon => + (await (await fetch(addon.getResourceURI("manifest.json").spec)).json()) + ?.chrome_settings_overrides?.search_provider; + const reloadIfNeeded = async addon => + addon.isActive && !(await isSearchEngine(addon)) && addon.reload(); + await Promise.all(addons.map(addon => reloadIfNeeded(addon))); } // Broadcast as a hook to clear other data View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4661475… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4661475… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] Bug 40989: Add .nobackup files to reproducible and disposable directories
by boklm (＠boklm) 20 Oct '23

20 Oct '23

boklm pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: 6fdfa43f by Richard Pospesel at 2023-10-20T08:18:52+02:00 Bug 40989: Add .nobackup files to reproducible and disposable directories - - - - - 7 changed files: - + git_clones/.nobackup - + hg_clones/.nobackup - + mullvadbrowser/.nobackup - + out/.nobackup - + testbuild/.nobackup - + tmp/.nobackup - + torbrowser/.nobackup Changes: ===================================== git_clones/.nobackup ===================================== ===================================== hg_clones/.nobackup ===================================== ===================================== mullvadbrowser/.nobackup ===================================== ===================================== out/.nobackup ===================================== ===================================== testbuild/.nobackup ===================================== ===================================== tmp/.nobackup ===================================== ===================================== torbrowser/.nobackup ===================================== View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40989: Add .nobackup files to reproducible and disposable directories
by boklm (＠boklm) 20 Oct '23

20 Oct '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6ed1f805 by Richard Pospesel at 2023-10-19T21:08:33+00:00 Bug 40989: Add .nobackup files to reproducible and disposable directories - - - - - 7 changed files: - + git_clones/.nobackup - + hg_clones/.nobackup - + mullvadbrowser/.nobackup - + out/.nobackup - + testbuild/.nobackup - + tmp/.nobackup - + torbrowser/.nobackup Changes: ===================================== git_clones/.nobackup ===================================== ===================================== hg_clones/.nobackup ===================================== ===================================== mullvadbrowser/.nobackup ===================================== ===================================== out/.nobackup ===================================== ===================================== testbuild/.nobackup ===================================== ===================================== tmp/.nobackup ===================================== ===================================== torbrowser/.nobackup ===================================== View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.4.0esr-13.5-1] 2 commits: fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by ma1 (＠ma1) 19 Oct '23

19 Oct '23

ma1 pushed to branch tor-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 365b399d by Henry Wilkes at 2023-10-19T16:09:40+01:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 42184: Make torconnect redirect compatible with blank home page. - - - - - 8982a325 by Henry Wilkes at 2023-10-19T16:09:41+01:00 fixup! Bug 40597: Implement TorSettings module Bug 42184: Split out URI fixup logic to fixupURIs and simplify. This method is used in TorConnectParent to fixup the home page preference. - - - - - 4 changed files: - browser/components/torconnect/TorConnectChild.sys.mjs - browser/components/torconnect/TorConnectParent.sys.mjs - browser/components/torconnect/content/aboutTorConnect.js - browser/modules/TorConnect.sys.mjs Changes: ===================================== browser/components/torconnect/TorConnectChild.sys.mjs ===================================== @@ -2,4 +2,78 @@ import { RemotePageChild } from "resource://gre/actors/RemotePageChild.sys.mjs"; -export class TorConnectChild extends RemotePageChild {} +export class TorConnectChild extends RemotePageChild { + /** + * Whether we have redirected the page (after bootstrapping) or not. + * + * @type {boolean} + */ + #redirected = false; + + /** + * If bootstrapping is complete, or TorConnect is disabled, we redirect the + * page. + */ + async #maybeRedirect() { + if (await this.sendQuery("torconnect:should-show")) { + // Enabled and not yet bootstrapped. + return; + } + if (this.#redirected) { + return; + } + this.#redirected = true; + + const redirect = new URLSearchParams( + new URL(this.contentWindow.document.location.href).search + ).get("redirect"); + + // Fallback in error cases: + let replaceURI = "about:tor"; + try { + const url = new URL( + redirect + ? decodeURIComponent(redirect) + : // NOTE: We expect no redirect when address is entered manually, or + // about:torconnect is opened from preferences or urlbar. + // Go to the home page. + await this.sendQuery("torconnect:home-page") + ); + // Do not allow javascript URI. See tor-browser#41766 + if ( + ["about:", "file:", "https:", "http:"].includes(url.protocol) || + // Allow blank page. See tor-browser#42184. + // Blank page's are given as a chrome URL rather than "about:blank". + url.href === "chrome://browser/content/blanktab.html" + ) { + replaceURI = url.href; + } else { + console.error(`Scheme is not allowed "${redirect}"`); + } + } catch { + console.error(`Invalid redirect URL "${redirect}"`); + } + + // Replace the destination to prevent "about:torconnect" entering the + // history. + // NOTE: This is done here, in the window actor, rather than in content + // because we have the privilege to redirect to a "chrome:" uri here (for + // when the HomePage is set to be blank). + this.contentWindow.location.replace(replaceURI); + } + + actorCreated() { + super.actorCreated(); + // about:torconnect could need to be immediately redirected. E.g. if it is + // reached after bootstrapping. + this.#maybeRedirect(); + } + + receiveMessage(message) { + super.receiveMessage(message); + + if (message.name === "torconnect:state-change") { + this.#maybeRedirect(); + } + } +} ===================================== browser/components/torconnect/TorConnectParent.sys.mjs ===================================== @@ -1,5 +1,7 @@ // Copyright (c) 2021, The Tor Project, Inc. +import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs"; + const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); import { InternetStatus, @@ -15,6 +17,12 @@ import { const BroadcastTopic = "about-torconnect:broadcast"; +const lazy = {}; + +XPCOMUtils.defineLazyModuleGetters(lazy, { + HomePage: "resource:///modules/HomePage.jsm", +}); + /* This object is basically a marshalling interface between the TorConnect module and a particular about:torconnect page @@ -167,6 +175,11 @@ export class TorConnectParent extends JSWindowActorParent { async receiveMessage(message) { switch (message.name) { + case "torconnect:should-show": + return Promise.resolve(TorConnect.shouldShowTorConnect); + case "torconnect:home-page": + // If there are multiple home pages, just load the first one. + return Promise.resolve(TorConnect.fixupURIs(lazy.HomePage.get())[0]); case "torconnect:set-quickstart": TorSettings.quickstart.enabled = message.data; TorSettings.saveToPrefs().applySettings(); ===================================== browser/components/torconnect/content/aboutTorConnect.js ===================================== @@ -136,10 +136,6 @@ class AboutTorConnect { tryBridgeButton: document.querySelector(this.selectors.buttons.tryBridge), }); - // a redirect url can be passed as a query parameter for the page to - // forward us to once bootstrap completes (otherwise the window will just close) - redirect = null; - uiState = { currentState: UIStates.ConnectToTor, allowAutomaticLocation: true, @@ -425,11 +421,6 @@ class AboutTorConnect { this.setLongText(TorStrings.settings.torPreferencesDescription); this.setProgress("", showProgressbar, 100); this.hideButtons(); - - // redirects page to the requested redirect url, removes about:torconnect - // from the page stack, so users cannot accidentally go 'back' to the - // now unresponsive page - window.location.replace(this.redirect); } update_Disabled(state) { @@ -822,23 +813,6 @@ class AboutTorConnect { } async init() { - // if the user gets here manually or via the button in the urlbar - // then we will redirect to about:tor - this.redirect = "about:tor"; - - // see if a user has a final destination after bootstrapping - let params = new URLSearchParams(new URL(document.location.href).search); - if (params.has("redirect")) { - try { - const redirect = new URL(decodeURIComponent(params.get("redirect"))); - if (/^(?:https?|about):$/.test(redirect.protocol)) { - this.redirect = redirect.href; - } - } catch (e) { - console.error(e, `Invalid redirect URL "${params.get("redirect")}"!`); - } - } - let args = await RPMSendQuery("torconnect:get-init-args"); // various constants ===================================== browser/modules/TorConnect.sys.mjs ===================================== @@ -1156,67 +1156,54 @@ export const TorConnect = (() => { return `about:torconnect?redirect=${encodeURIComponent(url)}`; }, + /** + * Convert the given object into a list of valid URIs. + * + * The object is either from the user's homepage preference (which may + * contain multiple domains separated by "|") or uris passed to the browser + * via command-line. + * + * @param {string|string[]} uriVariant - The string to extract uris from. + * + * @return {string[]} - The array of uris found. + */ + fixupURIs(uriVariant) { + let uriArray; + if (typeof uriVariant === "string") { + uriArray = uriVariant.split("|"); + } else if ( + Array.isArray(uriVariant) && + uriVariant.every(entry => typeof entry === "string") + ) { + uriArray = uriVariant; + } else { + // about:tor as safe fallback + console.error( + `TorConnect: received unknown variant '${JSON.stringify(uriVariant)}'` + ); + uriArray = ["about:tor"]; + } + + // Attempt to convert user-supplied string to a uri, fallback to + // about:tor if cannot convert to valid uri object + return uriArray.map( + uriString => + Services.uriFixup.getFixupURIInfo( + uriString, + Ci.nsIURIFixup.FIXUP_FLAG_NONE + ).preferredURI?.spec ?? "about:tor" + ); + }, + // called from browser.js on browser startup, passed in either the user's homepage(s) // or uris passed via command-line; we want to replace them with about:torconnect uris // which redirect after bootstrapping getURIsToLoad(uriVariant) { - // convert the object we get from browser.js - let uriStrings = (v => { - // an interop array - if (v instanceof Ci.nsIArray) { - // Transform the nsIArray of nsISupportsString's into a JS Array of - // JS strings. - return Array.from( - v.enumerate(Ci.nsISupportsString), - supportStr => supportStr.data - ); - // an interop string - } else if (v instanceof Ci.nsISupportsString) { - return [v.data]; - // a js string - } else if (typeof v === "string") { - return v.split("|"); - // a js array of js strings - } else if ( - Array.isArray(v) && - v.reduce((allStrings, entry) => { - return allStrings && typeof entry === "string"; - }, true) - ) { - return v; - } - // about:tor as safe fallback - console.log( - `TorConnect: getURIsToLoad() received unknown variant '${JSON.stringify( - v - )}'` - ); - return ["about:tor"]; - })(uriVariant); - - // will attempt to convert user-supplied string to a uri, fallback to about:tor if cannot convert - // to valid uri object - let uriStringToUri = uriString => { - const fixupFlags = Ci.nsIURIFixup.FIXUP_FLAG_NONE; - let uri = Services.uriFixup.getFixupURIInfo( - uriString, - fixupFlags - ).preferredURI; - return uri ? uri : Services.io.newURI("about:tor"); - }; - let uris = uriStrings.map(uriStringToUri); - - // assume we have a valid uri and generate an about:torconnect redirect uri - let redirectUrls = uris.map(uri => this.getRedirectURL(uri.spec)); - + const uris = this.fixupURIs(uriVariant); console.log( - `TorConnect: Will load after bootstrap => [${uris - .map(uri => { - return uri.spec; - }) - .join(", ")}]` + `TorConnect: Will load after bootstrap => [${uris.join(", ")}]` ); - return redirectUrls; + return uris.map(uri => this.getRedirectURL(uri)); }, }; return retval; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ef3a54… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ef3a54… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 40983: Bump versions for 13.5.
by Pier Angelo Vendrame (＠pierov) 19 Oct '23

19 Oct '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 04fb18b1 by Pier Angelo Vendrame at 2023-10-19T09:16:51+02:00 Bug 40983: Bump versions for 13.5. Also, update the MB extension, that was updated only on the 13.0 branch. - - - - - 6c469013 by Pier Angelo Vendrame at 2023-10-19T09:16:57+02:00 Revert "Bug 40933: Add symlinks to have incrementals between 12.5.x and 13.0" This reverts commit a21969281d18941b69a94b994b0797f8b88ad45f. We do not need it anymore, because the latest alphas already used the new naming scheme. - - - - - 8 changed files: - Makefile - projects/browser/config - projects/firefox-android/config - projects/firefox/config - projects/geckoview/config - projects/release/config - − projects/release/link_old_mar_filenames - rbm.conf Changes: ===================================== Makefile ===================================== @@ -183,7 +183,6 @@ torbrowser-testbuild-src: submodule-update torbrowser-incrementals-release: submodule-update $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target torbrowser tools/update-responses/download_missing_versions release - $(rbm) build release --step link_old_mar_filenames --target release --target torbrowser tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release --target torbrowser @@ -196,7 +195,6 @@ torbrowser-incrementals-release-unsigned: submodule-update torbrowser-incrementals-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target torbrowser tools/update-responses/download_missing_versions alpha - $(rbm) build release --step link_old_mar_filenames --target alpha --target torbrowser tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha --target torbrowser @@ -223,14 +221,12 @@ torbrowser-dmg2mar-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed --target torbrowser $(rbm) build release --step dmg2mar --target release --target signed --target torbrowser tools/update-responses/download_missing_versions release - $(rbm) build release --step link_old_mar_filenames --target release --target torbrowser CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release torbrowser-dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser $(rbm) build release --step dmg2mar --target alpha --target signed --target torbrowser tools/update-responses/download_missing_versions alpha - $(rbm) build release --step link_old_mar_filenames --target alpha --target torbrowser CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha @@ -515,7 +511,6 @@ mullvadbrowser-testbuild-src: submodule-update mullvadbrowser-incrementals-release: submodule-update $(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target mullvadbrowser tools/update-responses/download_missing_versions release - $(rbm) build release --step link_old_mar_filenames --target release --target mullvadbrowser tools/update-responses/gen_incrementals release $(rbm) build release --step hash_incrementals --target release --target mullvadbrowser @@ -528,7 +523,6 @@ mullvadbrowser-incrementals-release-unsigned: submodule-update mullvadbrowser-incrementals-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target mullvadbrowser tools/update-responses/download_missing_versions alpha - $(rbm) build release --step link_old_mar_filenames --target alpha --target mullvadbrowser tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha --target mullvadbrowser @@ -555,14 +549,12 @@ mullvadbrowser-dmg2mar-release: submodule-update $(rbm) build release --step update_responses_config --target release --target signed --target mullvadbrowser $(rbm) build release --step dmg2mar --target release --target signed --target mullvadbrowser tools/update-responses/download_missing_versions release - $(rbm) build release --step link_old_mar_filenames --target release --target mullvadbrowser CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release mullvadbrowser-dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed --target mullvadbrowser $(rbm) build release --step dmg2mar --target alpha --target signed --target mullvadbrowser tools/update-responses/download_missing_versions alpha - $(rbm) build release --step link_old_mar_filenames --target alpha --target mullvadbrowser CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha ===================================== projects/browser/config ===================================== @@ -95,9 +95,9 @@ input_files: name: ublock-origin sha256sum: e8ee3f9d597a6d42db9d73fe87c1d521de340755fd8bfdd69e41623edfe096d6 enable: '[% c("var/mullvad-browser") %]' - - URL: https://github.com/mullvad/browser-extension/releases/download/v0.8.3-firef… + - URL: https://cdn.mullvad.net/browser-extension/0.8.4/mullvad-browser-extension-0… name: mullvad-extension - sha256sum: e531ce6e809091eb40848874ea9e695bce61196397b6d8238ab582a152e02ac7 + sha256sum: a0057a37482e178331cde7a6fd3c100315fcfc26e804aa37c9281f412d24cb79 enable: '[% c("var/mullvad-browser") %]' - filename: 'gtk3-settings.ini' enable: '[% c("var/linux") %]' ===================================== projects/firefox-android/config ===================================== @@ -15,8 +15,8 @@ container: var: fenix_version: 115.2.1 - browser_branch: 13.0-1 - browser_build: 5 + browser_branch: 13.5-1 + browser_build: 1 variant: Beta # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 1 ===================================== projects/firefox/config ===================================== @@ -14,11 +14,11 @@ container: use_container: 1 var: - firefox_platform_version: 115.3.0 + firefox_platform_version: 115.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - browser_series: '13.0' + browser_series: '13.5' browser_branch: '[% c("var/browser_series") %]-1' - browser_build: 3 + browser_build: 1 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/geckoview/config ===================================== @@ -14,9 +14,9 @@ container: use_container: 1 var: - geckoview_version: 115.3.0esr - browser_branch: 13.0-1 - browser_build: 3 + geckoview_version: 115.4.0esr + browser_branch: 13.5-1 + browser_build: 1 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' ===================================== projects/release/config ===================================== @@ -243,11 +243,6 @@ steps: debug: 0 input_files: [] update_responses_config: '[% INCLUDE update_responses_config %]' - link_old_mar_filenames: - build_log: '-' - debug: 0 - input_files: [] - link_old_mar_filenames: '[% INCLUDE link_old_mar_filenames %]' create_update_responses_tar: build_log: '-' debug: 0 ===================================== projects/release/link_old_mar_filenames deleted ===================================== @@ -1,19 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -# This script is for #40933: -# Fix generating incrementals between 12.5.x and 13.0 -[% FOREACH version = c("var/torbrowser_incremental_from") %] - cd [% shell_quote(path(dest_dir)) %]/[% IF c("var/unsigned_releases_dir") %]un[% END %]signed/[% version %] - test -e [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar || \ - ln -s [% c("var/project-name") %]-linux32-[% version %]_ALL.mar \ - [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar - test -e [% c("var/project-name") %]-linux-x86_64-[% version %]_ALL.mar || \ - ln -s [% c("var/project-name") %]-linux64-[% version %]_ALL.mar \ - [% c("var/project-name") %]-linux-x86_64-[% version %]_ALL.mar - test -e [% c("var/project-name") %]-windows-i686-[% version %]_ALL.mar || \ - ln -s [% c("var/project-name") %]-win32-[% version %]_ALL.mar \ - [% c("var/project-name") %]-windows-i686-[% version %]_ALL.mar - test -e [% c("var/project-name") %]-windows-x86_64-[% version %]_ALL.mar || \ - ln -s [% c("var/project-name") %]-win64-[% version %]_ALL.mar \ - [% c("var/project-name") %]-windows-x86_64-[% version %]_ALL.mar -[% END -%] ===================================== rbm.conf ===================================== @@ -81,12 +81,12 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.0a6' + torbrowser_version: '13.5a1' torbrowser_build: 'build1' torbrowser_incremental_from: - - '13.0a3' - '13.0a4' - '13.0a5' + - '13.0a6' updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.4.0esr-13.5-1] fixup! Bug 42019: Empty browser's clipboard on browser shutdown
by richard (＠richard) 18 Oct '23

18 Oct '23

richard pushed to branch mullvad-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 68ee3400 by hackademix at 2023-10-18T21:27:57+00:00 fixup! Bug 42019: Empty browser's clipboard on browser shutdown Bug 42154: empty clipboard content from private windows on exit. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - browser/components/BrowserGlue.sys.mjs Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -87,6 +87,9 @@ pref("browser.sessionstore.resume_from_crash", false); // Also not needed in PBM at the moment. pref("browser.pagethumbnails.capturing_disabled", true); +// Empty clipboard content from private windows on exit (tor-browser#42154) +pref("browser.privatebrowsing.preserveClipboard", false); + // Enable HTTPS-Only mode (tor-browser#19850) pref("dom.security.https_only_mode", true); // The previous pref automatically sets this to true (see StaticPrefList.yaml), ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -148,6 +148,119 @@ const PRIVATE_BROWSING_EXE_ICON_INDEX = 1; const PREF_PRIVATE_BROWSING_SHORTCUT_CREATED = "browser.privacySegmentation.createdShortcut"; +// Empty clipboard content from private windows on exit +// (tor-browser#42154) +const ClipboardPrivacy = { + _lastClipboardHash: null, + _globalActivation: false, + _isPrivateClipboard: false, + _hasher: null, + + _computeClipboardHash(win = Services.ww.activeWindow) { + const trans = Cc["@mozilla.org/widget/transferable;1"].createInstance( + Ci.nsITransferable + ); + trans.init(win?.docShell?.QueryInterface(Ci.nsILoadContext) || null); + ["text/x-moz-url", "text/plain"].forEach(trans.addDataFlavor); + try { + Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard); + const clipboardContent = {}; + trans.getAnyTransferData({}, clipboardContent); + const { data } = clipboardContent.value.QueryInterface( + Ci.nsISupportsString + ); + const bytes = new TextEncoder().encode(data); + const hasher = (this._hasher ||= Cc[ + "@mozilla.org/security/hash;1" + ].createInstance(Ci.nsICryptoHash)); + hasher.init(hasher.SHA256); + hasher.update(bytes, bytes.length); + return hasher.finish(true); + } catch (e) {} + return null; + }, + + startup() { + this._lastClipboardHash = this._computeClipboardHash(); + + // Here we track changes in active window / application, + // by filtering focus events and window closures. + const handleActivation = (win, activation) => { + if (activation) { + if (!this._globalActivation) { + // focus changed within this window, bail out. + return; + } + this._globalActivation = false; + } else if (!Services.focus.activeWindow) { + // focus is leaving this window: + // let's track whether it remains within the browser. + lazy.setTimeout(() => { + this._globalActivation = !Services.focus.activeWindow; + }, 100); + } + const clipboardHash = this._computeClipboardHash(win); + if (clipboardHash !== this._lastClipboardHash) { + this._isPrivateClipboard = + !activation && + (lazy.PrivateBrowsingUtils.permanentPrivateBrowsing || + lazy.PrivateBrowsingUtils.isWindowPrivate(win)); + this._lastClipboardHash = clipboardHash; + console.log( + `Clipboard changed: private ${this._isPrivateClipboard}, hash ${clipboardHash}.` + ); + } + }; + const focusListener = e => + e.isTrusted && handleActivation(e.currentTarget, e.type === "focusin"); + const initWindow = win => { + for (const e of ["focusin", "focusout"]) { + win.addEventListener(e, focusListener); + } + }; + for (const w of Services.ww.getWindowEnumerator()) { + initWindow(w); + } + Services.ww.registerNotification((win, event) => { + switch (event) { + case "domwindowopened": + initWindow(win); + break; + case "domwindowclosed": + handleActivation(win, false); + if ( + this._isPrivateClipboard && + lazy.PrivateBrowsingUtils.isWindowPrivate(win) && + !( + lazy.PrivateBrowsingUtils.permanentPrivateBrowsing || + Array.from(Services.ww.getWindowEnumerator()).find(w => + lazy.PrivateBrowsingUtils.isWindowPrivate(w) + ) + ) + ) { + // no more private windows, empty private content if needed + this.emptyPrivate(); + } + } + }); + }, + emptyPrivate() { + if ( + this._isPrivateClipboard && + !Services.prefs.getBoolPref( + "browser.privatebrowsing.preserveClipboard", + false + ) && + this._lastClipboardHash === this._computeClipboardHash() + ) { + Services.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard); + this._lastClipboardHash = null; + this._isPrivateClipboard = false; + console.log("Private clipboard emptied."); + } + }, +}; + /** * Fission-compatible JSProcess implementations. * Each actor options object takes the form of a ProcessActorOptions dictionary. @@ -1619,6 +1732,8 @@ BrowserGlue.prototype = { lazy.DoHController.init(); + ClipboardPrivacy.startup(); + this._firstWindowTelemetry(aWindow); this._firstWindowLoaded(); @@ -1879,7 +1994,7 @@ BrowserGlue.prototype = { lazy.UpdateListener.reset(); } }, - () => Services.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard), // tor-browser#42019 + () => ClipboardPrivacy.emptyPrivate(), // tor-browser#42019 ]; for (let task of tasks) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/68e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/68e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.4.0esr-13.5-1] fixup! Bug 42019: Empty browser's clipboard on browser shutdown
by richard (＠richard) 18 Oct '23

18 Oct '23

richard pushed to branch base-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: f3701b57 by hackademix at 2023-10-18T21:25:24+00:00 fixup! Bug 42019: Empty browser's clipboard on browser shutdown Bug 42154: empty clipboard content from private windows on exit. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - browser/components/BrowserGlue.sys.mjs Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -87,6 +87,9 @@ pref("browser.sessionstore.resume_from_crash", false); // Also not needed in PBM at the moment. pref("browser.pagethumbnails.capturing_disabled", true); +// Empty clipboard content from private windows on exit (tor-browser#42154) +pref("browser.privatebrowsing.preserveClipboard", false); + // Enable HTTPS-Only mode (tor-browser#19850) pref("dom.security.https_only_mode", true); // The previous pref automatically sets this to true (see StaticPrefList.yaml), ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -148,6 +148,119 @@ const PRIVATE_BROWSING_EXE_ICON_INDEX = 1; const PREF_PRIVATE_BROWSING_SHORTCUT_CREATED = "browser.privacySegmentation.createdShortcut"; +// Empty clipboard content from private windows on exit +// (tor-browser#42154) +const ClipboardPrivacy = { + _lastClipboardHash: null, + _globalActivation: false, + _isPrivateClipboard: false, + _hasher: null, + + _computeClipboardHash(win = Services.ww.activeWindow) { + const trans = Cc["@mozilla.org/widget/transferable;1"].createInstance( + Ci.nsITransferable + ); + trans.init(win?.docShell?.QueryInterface(Ci.nsILoadContext) || null); + ["text/x-moz-url", "text/plain"].forEach(trans.addDataFlavor); + try { + Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard); + const clipboardContent = {}; + trans.getAnyTransferData({}, clipboardContent); + const { data } = clipboardContent.value.QueryInterface( + Ci.nsISupportsString + ); + const bytes = new TextEncoder().encode(data); + const hasher = (this._hasher ||= Cc[ + "@mozilla.org/security/hash;1" + ].createInstance(Ci.nsICryptoHash)); + hasher.init(hasher.SHA256); + hasher.update(bytes, bytes.length); + return hasher.finish(true); + } catch (e) {} + return null; + }, + + startup() { + this._lastClipboardHash = this._computeClipboardHash(); + + // Here we track changes in active window / application, + // by filtering focus events and window closures. + const handleActivation = (win, activation) => { + if (activation) { + if (!this._globalActivation) { + // focus changed within this window, bail out. + return; + } + this._globalActivation = false; + } else if (!Services.focus.activeWindow) { + // focus is leaving this window: + // let's track whether it remains within the browser. + lazy.setTimeout(() => { + this._globalActivation = !Services.focus.activeWindow; + }, 100); + } + const clipboardHash = this._computeClipboardHash(win); + if (clipboardHash !== this._lastClipboardHash) { + this._isPrivateClipboard = + !activation && + (lazy.PrivateBrowsingUtils.permanentPrivateBrowsing || + lazy.PrivateBrowsingUtils.isWindowPrivate(win)); + this._lastClipboardHash = clipboardHash; + console.log( + `Clipboard changed: private ${this._isPrivateClipboard}, hash ${clipboardHash}.` + ); + } + }; + const focusListener = e => + e.isTrusted && handleActivation(e.currentTarget, e.type === "focusin"); + const initWindow = win => { + for (const e of ["focusin", "focusout"]) { + win.addEventListener(e, focusListener); + } + }; + for (const w of Services.ww.getWindowEnumerator()) { + initWindow(w); + } + Services.ww.registerNotification((win, event) => { + switch (event) { + case "domwindowopened": + initWindow(win); + break; + case "domwindowclosed": + handleActivation(win, false); + if ( + this._isPrivateClipboard && + lazy.PrivateBrowsingUtils.isWindowPrivate(win) && + !( + lazy.PrivateBrowsingUtils.permanentPrivateBrowsing || + Array.from(Services.ww.getWindowEnumerator()).find(w => + lazy.PrivateBrowsingUtils.isWindowPrivate(w) + ) + ) + ) { + // no more private windows, empty private content if needed + this.emptyPrivate(); + } + } + }); + }, + emptyPrivate() { + if ( + this._isPrivateClipboard && + !Services.prefs.getBoolPref( + "browser.privatebrowsing.preserveClipboard", + false + ) && + this._lastClipboardHash === this._computeClipboardHash() + ) { + Services.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard); + this._lastClipboardHash = null; + this._isPrivateClipboard = false; + console.log("Private clipboard emptied."); + } + }, +}; + /** * Fission-compatible JSProcess implementations. * Each actor options object takes the form of a ProcessActorOptions dictionary. @@ -1652,6 +1765,8 @@ BrowserGlue.prototype = { lazy.DoHController.init(); + ClipboardPrivacy.startup(); + this._firstWindowTelemetry(aWindow); this._firstWindowLoaded(); @@ -1912,7 +2027,7 @@ BrowserGlue.prototype = { lazy.UpdateListener.reset(); } }, - () => Services.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard), // tor-browser#42019 + () => ClipboardPrivacy.emptyPrivate(), // tor-browser#42019 ]; for (let task of tasks) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f3701b5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f3701b5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.4.0esr-13.5-1] fixup! Bug 42019: Empty browser's clipboard on browser shutdown
by richard (＠richard) 18 Oct '23

18 Oct '23

richard pushed to branch tor-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: ef3a546d by hackademix at 2023-10-18T21:46:03+02:00 fixup! Bug 42019: Empty browser's clipboard on browser shutdown Bug 42154: empty clipboard content from private windows on exit. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - browser/components/BrowserGlue.sys.mjs Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -87,6 +87,9 @@ pref("browser.sessionstore.resume_from_crash", false); // Also not needed in PBM at the moment. pref("browser.pagethumbnails.capturing_disabled", true); +// Empty clipboard content from private windows on exit (tor-browser#42154) +pref("browser.privatebrowsing.preserveClipboard", false); + // Enable HTTPS-Only mode (tor-browser#19850) pref("dom.security.https_only_mode", true); // The previous pref automatically sets this to true (see StaticPrefList.yaml), ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -150,6 +150,119 @@ const PRIVATE_BROWSING_EXE_ICON_INDEX = 1; const PREF_PRIVATE_BROWSING_SHORTCUT_CREATED = "browser.privacySegmentation.createdShortcut"; +// Empty clipboard content from private windows on exit +// (tor-browser#42154) +const ClipboardPrivacy = { + _lastClipboardHash: null, + _globalActivation: false, + _isPrivateClipboard: false, + _hasher: null, + + _computeClipboardHash(win = Services.ww.activeWindow) { + const trans = Cc["@mozilla.org/widget/transferable;1"].createInstance( + Ci.nsITransferable + ); + trans.init(win?.docShell?.QueryInterface(Ci.nsILoadContext) || null); + ["text/x-moz-url", "text/plain"].forEach(trans.addDataFlavor); + try { + Services.clipboard.getData(trans, Ci.nsIClipboard.kGlobalClipboard); + const clipboardContent = {}; + trans.getAnyTransferData({}, clipboardContent); + const { data } = clipboardContent.value.QueryInterface( + Ci.nsISupportsString + ); + const bytes = new TextEncoder().encode(data); + const hasher = (this._hasher ||= Cc[ + "@mozilla.org/security/hash;1" + ].createInstance(Ci.nsICryptoHash)); + hasher.init(hasher.SHA256); + hasher.update(bytes, bytes.length); + return hasher.finish(true); + } catch (e) {} + return null; + }, + + startup() { + this._lastClipboardHash = this._computeClipboardHash(); + + // Here we track changes in active window / application, + // by filtering focus events and window closures. + const handleActivation = (win, activation) => { + if (activation) { + if (!this._globalActivation) { + // focus changed within this window, bail out. + return; + } + this._globalActivation = false; + } else if (!Services.focus.activeWindow) { + // focus is leaving this window: + // let's track whether it remains within the browser. + lazy.setTimeout(() => { + this._globalActivation = !Services.focus.activeWindow; + }, 100); + } + const clipboardHash = this._computeClipboardHash(win); + if (clipboardHash !== this._lastClipboardHash) { + this._isPrivateClipboard = + !activation && + (lazy.PrivateBrowsingUtils.permanentPrivateBrowsing || + lazy.PrivateBrowsingUtils.isWindowPrivate(win)); + this._lastClipboardHash = clipboardHash; + console.log( + `Clipboard changed: private ${this._isPrivateClipboard}, hash ${clipboardHash}.` + ); + } + }; + const focusListener = e => + e.isTrusted && handleActivation(e.currentTarget, e.type === "focusin"); + const initWindow = win => { + for (const e of ["focusin", "focusout"]) { + win.addEventListener(e, focusListener); + } + }; + for (const w of Services.ww.getWindowEnumerator()) { + initWindow(w); + } + Services.ww.registerNotification((win, event) => { + switch (event) { + case "domwindowopened": + initWindow(win); + break; + case "domwindowclosed": + handleActivation(win, false); + if ( + this._isPrivateClipboard && + lazy.PrivateBrowsingUtils.isWindowPrivate(win) && + !( + lazy.PrivateBrowsingUtils.permanentPrivateBrowsing || + Array.from(Services.ww.getWindowEnumerator()).find(w => + lazy.PrivateBrowsingUtils.isWindowPrivate(w) + ) + ) + ) { + // no more private windows, empty private content if needed + this.emptyPrivate(); + } + } + }); + }, + emptyPrivate() { + if ( + this._isPrivateClipboard && + !Services.prefs.getBoolPref( + "browser.privatebrowsing.preserveClipboard", + false + ) && + this._lastClipboardHash === this._computeClipboardHash() + ) { + Services.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard); + this._lastClipboardHash = null; + this._isPrivateClipboard = false; + console.log("Private clipboard emptied."); + } + }, +}; + /** * Fission-compatible JSProcess implementations. * Each actor options object takes the form of a ProcessActorOptions dictionary. @@ -1753,6 +1866,8 @@ BrowserGlue.prototype = { lazy.TorProviderBuilder.firstWindowLoaded(); + ClipboardPrivacy.startup(); + this._firstWindowTelemetry(aWindow); this._firstWindowLoaded(); @@ -2013,7 +2128,7 @@ BrowserGlue.prototype = { lazy.UpdateListener.reset(); } }, - () => Services.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard), // tor-browser#42019 + () => ClipboardPrivacy.emptyPrivate(), // tor-browser#42019 () => lazy.OnionAliasStore.uninit(), ]; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ef3a546… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ef3a546… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] Bug 40984: Include PDBs also from obj-*/dist.
by Pier Angelo Vendrame (＠pierov) 18 Oct '23

18 Oct '23

Pier Angelo Vendrame pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: 7ea63162 by Pier Angelo Vendrame at 2023-10-18T09:48:29+02:00 Bug 40984: Include PDBs also from obj-*/dist. Because of a difference between the investigation on adding PDBs and the actual implementation, we were missing .pdb files for .exe files. - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -229,7 +229,7 @@ RBM_TB_EOF mkdir -p $distdir/Debug/Browser pushd obj-* cp -Lr dist/include $distdir/Debug/ - find . $ -path ./dist -o -path ./_tests $ -prune -o -name '*.pdb' -exec cp -l {} $distdir/Debug/Browser/ \; + find . -path ./_tests -prune -o -name '*.pdb' -exec cp -l {} $distdir/Debug/Browser/ \; popd [% END -%] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40984: Include PDBs also from obj-*/dist.
by Pier Angelo Vendrame (＠pierov) 18 Oct '23

18 Oct '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: ffafd421 by Pier Angelo Vendrame at 2023-10-17T18:41:56+02:00 Bug 40984: Include PDBs also from obj-*/dist. Because of a difference between the investigation on adding PDBs and the actual implementation, we were missing .pdb files for .exe files. - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -229,7 +229,7 @@ RBM_TB_EOF mkdir -p $distdir/Debug/Browser pushd obj-* cp -Lr dist/include $distdir/Debug/ - find . $ -path ./dist -o -path ./_tests $ -prune -o -name '*.pdb' -exec cp -l {} $distdir/Debug/Browser/ \; + find . -path ./_tests -prune -o -name '*.pdb' -exec cp -l {} $distdir/Debug/Browser/ \; popd [% END -%] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.4.0esr-13.5-1] fixup! Bug 40926: Implemented the New Identity feature
by richard (＠richard) 17 Oct '23

17 Oct '23

richard pushed to branch mullvad-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 77c1e6b0 by hackademix at 2023-10-17T21:23:30+00:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42182: avoid reloading any search engine extension. - - - - - 1 changed file: - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -415,10 +415,13 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { async reloadAddons() { logger.info("Reloading add-ons to clear their temporary state."); // Reload all active extensions except search engines, which would throw. - const addons = ( - await AddonManager.getAddonsByTypes(["extension"]) - ).filter(a => a.isActive && !a.id.endsWith("@search.mozilla.org")); - await Promise.all(addons.map(a => a.reload())); + const addons = await AddonManager.getAddonsByTypes(["extension"]); + const isSearchEngine = async addon => + (await (await fetch(addon.getResourceURI("manifest.json").spec)).json()) + ?.chrome_settings_overrides?.search_provider; + const reloadIfNeeded = async addon => + addon.isActive && !(await isSearchEngine(addon)) && addon.reload(); + await Promise.all(addons.map(addon => reloadIfNeeded(addon))); } // Broadcast as a hook to clear other data View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/77c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/77c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.4.0esr-13.5-1] fixup! Bug 40926: Implemented the New Identity feature
by richard (＠richard) 17 Oct '23

17 Oct '23

richard pushed to branch base-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 322d308f by hackademix at 2023-10-17T21:21:48+00:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42182: avoid reloading any search engine extension. - - - - - 1 changed file: - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -415,10 +415,13 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { async reloadAddons() { logger.info("Reloading add-ons to clear their temporary state."); // Reload all active extensions except search engines, which would throw. - const addons = ( - await AddonManager.getAddonsByTypes(["extension"]) - ).filter(a => a.isActive && !a.id.endsWith("@search.mozilla.org")); - await Promise.all(addons.map(a => a.reload())); + const addons = await AddonManager.getAddonsByTypes(["extension"]); + const isSearchEngine = async addon => + (await (await fetch(addon.getResourceURI("manifest.json").spec)).json()) + ?.chrome_settings_overrides?.search_provider; + const reloadIfNeeded = async addon => + addon.isActive && !(await isSearchEngine(addon)) && addon.reload(); + await Promise.all(addons.map(addon => reloadIfNeeded(addon))); } // Broadcast as a hook to clear other data View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/322d308… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/322d308… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.4.0esr-13.5-1] fixup! Bug 40926: Implemented the New Identity feature
by richard (＠richard) 17 Oct '23

17 Oct '23

richard pushed to branch tor-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 14f080cd by hackademix at 2023-10-17T21:17:17+00:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42182: avoid reloading any search engine extension. - - - - - 1 changed file: - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -415,10 +415,13 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { async reloadAddons() { logger.info("Reloading add-ons to clear their temporary state."); // Reload all active extensions except search engines, which would throw. - const addons = ( - await AddonManager.getAddonsByTypes(["extension"]) - ).filter(a => a.isActive && !a.id.endsWith("@search.mozilla.org")); - await Promise.all(addons.map(a => a.reload())); + const addons = await AddonManager.getAddonsByTypes(["extension"]); + const isSearchEngine = async addon => + (await (await fetch(addon.getResourceURI("manifest.json").spec)).json()) + ?.chrome_settings_overrides?.search_provider; + const reloadIfNeeded = async addon => + addon.isActive && !(await isSearchEngine(addon)) && addon.reload(); + await Promise.all(addons.map(addon => reloadIfNeeded(addon))); } // Broadcast as a hook to clear other data View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/14f080c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/14f080c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.4.0esr-13.5-1] fixup! Bug 21952: Implement Onion-Location
by richard (＠richard) 17 Oct '23

17 Oct '23

richard pushed to branch tor-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 18023383 by Henry Wilkes at 2023-10-17T21:14:41+00:00 fixup! Bug 21952: Implement Onion-Location Bug 41341: Make the body text of onion-location-notification non-bold, and anchor the popup to the bottom right corner of the ".onion available" button. - - - - - 3 changed files: - browser/base/content/popup-notifications.inc - browser/components/onionservices/OnionLocationParent.jsm - browser/components/onionservices/content/onionlocation.css Changes: ===================================== browser/base/content/popup-notifications.inc ===================================== @@ -8,6 +8,15 @@ noautofocus="true" role="alert"/> +  + <popupnotification id="onion-location-notification" hidden="true"> + <popupnotificationcontent orient="vertical"> + <description id="onion-location-body-text"/> + </popupnotificationcontent> + </popupnotification> + <popupnotification id="webRTC-shareDevices-notification" hidden="true" descriptionid="webRTC-shareDevices-notification-description"> <popupnotificationcontent id="webRTC-selectCamera" orient="vertical"> ===================================== browser/components/onionservices/OnionLocationParent.jsm ===================================== @@ -13,12 +13,11 @@ const PRIORITIZE_ONIONS_PREF = "privacy.prioritizeonions.enabled"; // Element IDs const ONIONLOCATION_BOX_ID = "onion-location-box"; -const ONIONLOCATION_BUTTON_ID = "onion-location-button"; const ONIONLOCATION_LABEL_ID = "onion-label"; // Notification IDs const NOTIFICATION_ID = "onion-location"; -const NOTIFICATION_ANCHOR_ID = "onionlocation"; +const NOTIFICATION_ANCHOR_ID = "onion-location-box"; // Strings const STRING_ONION_AVAILABLE = TorStrings.onionLocation.onionAvailable; @@ -108,6 +107,9 @@ class OnionLocationParent extends JSWindowActorParent { callback: () => {}, }; + win.document.getElementById("onion-location-body-text").textContent = + NOTIFICATION_DESCRIPTION; + const options = { autofocus: true, persistent: true, @@ -115,28 +117,25 @@ class OnionLocationParent extends JSWindowActorParent { 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", + popupOptions: { + position: "bottomright topright", + }, }; - // 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/080f9ed47742644d2ff84f7aa0b10aea5c4… - browser.onionlocationpopupnotificationanchor = win.document.getElementById( - ONIONLOCATION_BUTTON_ID - ); + // A hacky way of setting the popup anchor outside the usual url bar icon + // box, similar to CRF and addons. + // See: https://searchfox.org/mozilla-esr115/rev/7962d6b7b17ee105ad64ab7906af2b9179… + browser[NOTIFICATION_ANCHOR_ID + "popupnotificationanchor"] = + win.document.getElementById(NOTIFICATION_ANCHOR_ID); browser._onionLocationPrompt = win.PopupNotifications.show( browser, NOTIFICATION_ID, - NOTIFICATION_DESCRIPTION, + NOTIFICATION_TITLE, NOTIFICATION_ANCHOR_ID, mainAction, [cancelAction], ===================================== browser/components/onionservices/content/onionlocation.css ===================================== @@ -5,7 +5,3 @@ -moz-context-properties: fill; fill: currentColor; } - -.onionlocation-notification-icon { - display: none; -} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1802338… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1802338… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.4.0esr-13.5-1] 2 commits: fixup! Bug 40933: Add tor-launcher functionality
by richard (＠richard) 17 Oct '23

17 Oct '23

richard pushed to branch tor-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 890eb18c by Pier Angelo Vendrame at 2023-10-17T16:26:43+02:00 fixup! Bug 40933: Add tor-launcher functionality Bug 42108: Use the sentconnect event to update the circuit display In this way, the circuit might be updated more often, because some circuits will not work for some sites, but it might be what users want, especially when the browser fails and you would like to know the exit node that has been blocked. - - - - - d4cf2169 by Pier Angelo Vendrame at 2023-10-17T16:29:23+02:00 fixup! Bug 3455: Add DomainIsolator, for isolating circuit by domain. Bug 42108: Use the sentconnect event to update the circuit display Use the new topic name in the domain isolator. - - - - - 4 changed files: - toolkit/components/tor-launcher/TorControlPort.sys.mjs - toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs - toolkit/components/tor-launcher/TorProvider.sys.mjs - toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs Changes: ===================================== toolkit/components/tor-launcher/TorControlPort.sys.mjs ===================================== @@ -1043,15 +1043,15 @@ export class TorController { } break; case "STREAM": - const succeeedEvent = - /^(?<StreamID>[a-zA-Z0-9]{1,16})\sSUCCEEDED\s(?<CircuitID>[a-zA-Z0-9]{1,16})/.exec( + const sentConnectEvent = + /^(?<StreamID>[a-zA-Z0-9]{1,16})\sSENTCONNECT\s(?<CircuitID>[a-zA-Z0-9]{1,16})/.exec( data.groups.data ); - if (succeeedEvent) { + if (sentConnectEvent) { const credentials = this.#parseCredentials(data.groups.data); - this.#eventHandler.onStreamSucceeded( - succeeedEvent.groups.StreamID, - succeeedEvent.groups.CircuitID, + this.#eventHandler.onStreamSentConnect( + sentConnectEvent.groups.StreamID, + sentConnectEvent.groups.CircuitID, credentials?.username ?? null, credentials?.password ?? null ); @@ -1190,8 +1190,9 @@ export class TorController { * (i.e., a CIRC event with a BUILT status) * @property {OnCircuitClosed} onCircuitClosed Called when a circuit is closed * (i.e., a CIRC event with a CLOSED status) - * @property {OnStreamSucceeded} onStreamSucceeded Called when a stream receives - * a reply (i.e., a STREAM event with a SUCCEEDED status) + * @property {OnStreamSentConnect} onStreamSentConnect Called when a stream sent + * a connect cell along a circuit (i.e., a STREAM event with a SENTCONNECT + * status) */ /** * @callback OnBootstrapStatus @@ -1217,7 +1218,7 @@ export class TorController { * @param {CircuitID} id The id of the circuit that has been closed */ /** - * @callback OnStreamSucceeded + * @callback OnStreamSentConnect * * @param {StreamID} streamId The id of the stream that switched to the succeeded * state ===================================== toolkit/components/tor-launcher/TorDomainIsolator.sys.mjs ===================================== @@ -146,7 +146,10 @@ class TorDomainIsolatorImpl { Services.prefs.addObserver(NON_TOR_PROXY_PREF, this); Services.obs.addObserver(this, NEW_IDENTITY_TOPIC); - Services.obs.addObserver(this, lazy.TorProviderTopics.StreamSucceeded); + Services.obs.addObserver( + this, + lazy.TorProviderTopics.CircuitCredentialsMatched + ); this.#cleanupIntervalId = setInterval( this.#clearKnownCircuits.bind(this), @@ -161,7 +164,10 @@ class TorDomainIsolatorImpl { uninit() { Services.prefs.removeObserver(NON_TOR_PROXY_PREF, this); Services.obs.removeObserver(this, NEW_IDENTITY_TOPIC); - Services.obs.removeObserver(this, lazy.TorProviderTopics.StreamSucceeded); + Services.obs.removeObserver( + this, + lazy.TorProviderTopics.CircuitCredentialsMatched + ); clearInterval(this.#cleanupIntervalId); this.#cleanupIntervalId = null; this.clearIsolation(); @@ -266,7 +272,7 @@ class TorDomainIsolatorImpl { logger.error("Could not send the newnym command", e); // TODO: What UX to use here? See tor-browser#41708 } - } else if (topic === lazy.TorProviderTopics.StreamSucceeded) { + } else if (topic === lazy.TorProviderTopics.CircuitCredentialsMatched) { const { username, password, circuit } = subject.wrappedJSObject; this.#updateCircuit(username, password, circuit); } ===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -991,19 +991,19 @@ export class TorProvider { } /** - * Handle a notification about a stream switching to the succeeded state. + * Handle a notification about a stream switching to the sentconnect status. * * @param {StreamID} streamId The ID of the stream that switched to the - * succeeded state. + * sentconnect status. * @param {CircuitID} circuitId The ID of the circuit used by the stream * @param {string} username The SOCKS username * @param {string} password The SOCKS password */ - async onStreamSucceeded(streamId, circuitId, username, password) { + async onStreamSentConnect(streamId, circuitId, username, password) { if (!username || !password) { return; } - logger.debug("Stream succeeded event", username, password, circuitId); + logger.debug("Stream sentconnect event", username, password, circuitId); let circuit = this.#circuits.get(circuitId); if (!circuit) { circuit = new Promise((resolve, reject) => { @@ -1017,7 +1017,7 @@ export class TorProvider { this.#circuits.set(id, nodes); } logger.error( - `Seen a STREAM SUCCEEDED with circuit ${circuitId}, but Tor did not send information about it.` + `Seen a STREAM SENTCONNECT with circuit ${circuitId}, but Tor did not send information about it.` ); reject(); }); @@ -1037,7 +1037,7 @@ export class TorProvider { circuit, }, }, - TorProviderTopics.StreamSucceeded + TorProviderTopics.CircuitCredentialsMatched ); } } ===================================== toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs ===================================== @@ -15,7 +15,7 @@ export const TorProviderTopics = Object.freeze({ BootstrapError: "TorBootstrapError", HasWarnOrErr: "TorLogHasWarnOrErr", BridgeChanged: "TorBridgeChanged", - StreamSucceeded: "TorStreamSucceeded", + CircuitCredentialsMatched: "TorCircuitCredentialsMatched", }); export const TorProviders = Object.freeze({ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e1b116… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e1b116… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android] Pushed new branch firefox-android-115.2.1-13.5-1
by Dan Ballard (＠dan) 17 Oct '23

17 Oct '23

Dan Ballard pushed new branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/tree/firef… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-115.4.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new tag mullvad-browser-115.4.0esr-13.5-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.4.0esr-13.5-1] 20 commits: MB 38: Mullvad Browser configuration
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed to branch mullvad-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 0b82d6ad by Pier Angelo Vendrame at 2023-10-17T11:58:14+02:00 MB 38: Mullvad Browser configuration - - - - - 889c419e by Pier Angelo Vendrame at 2023-10-17T11:58:17+02:00 MB 1: Mullvad Browser branding See also: mullvad-browser#5: Product name and directory customization mullvad-browser#12: Create new branding directories and integrate Mullvad icons+branding mullvad-browser#14: Remove Default Built-in bookmarks mullvad-browser#35: Add custom PDF icons for Windows builds mullvad-browser#48: Replace Mozilla copyright and legal trademarks in mullvadbrowser.exe metadata mullvad-browser#51: Update trademark string mullvad-browser#104: Update shipped dll metadata copyright/licensing info mullvad-browser#107: Add alpha and nightly icons - - - - - 0303cdbf by Pier Angelo Vendrame at 2023-10-17T12:00:20+02:00 fixup! MB 1: Mullvad Browser branding MB 244: Fix the link to Mullvad Browser Support - - - - - 1572b0c3 by Pier Angelo Vendrame at 2023-10-17T12:00:21+02:00 MB 20: Allow packaged-addons in PBM. We install a few addons from the distribution directory, but they are not automatically enabled for PBM mode. This commit modifies the code that installs them to also add the PBM permission to the known ones. - - - - - 1b7be33b by Pier Angelo Vendrame at 2023-10-17T12:00:21+02:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - 17b628c0 by Pier Angelo Vendrame at 2023-10-17T12:00:22+02:00 MB 37: Customization for the about dialog - - - - - cae48cd3 by Henry Wilkes at 2023-10-17T12:00:22+02:00 MB 39: Add home page about:mullvad-browser - - - - - b9fe9e6d by Pier Angelo Vendrame at 2023-10-17T12:00:22+02:00 fixup! MB 39: Add home page about:mullvad-browser MB 243: Make sure about:mullvad-browser is treated as a new tab page - - - - - 91554b7c by hackademix at 2023-10-17T12:00:23+02:00 MB 97: Remove UI cues to install new extensions. - - - - - 91c377c1 by hackademix at 2023-10-17T12:00:23+02:00 MB 47: uBlock Origin customization - - - - - 40bc3d0b by Pier Angelo Vendrame at 2023-10-17T12:00:23+02:00 MB 21: Disable the password manager This commit disables the about:login page and removes the "Login and Password" section of about:preferences. We do not do anything to the real password manager of Firefox, that is in toolkit: it contains C++ parts that make it difficult to actually prevent it from being built.. Finally, we modify the the function that opens about:login to report an error in the console so that we can quickly get a backtrace to the code that tries to use it. - - - - - 0bc79af4 by Pier Angelo Vendrame at 2023-10-17T12:00:24+02:00 MB 87: Disable the default browser box on Windows and Linux Windows and Linux will be distributed only as portable apps at the beginning, so they should not be settable as default browsers. We will need to improve the logic once we decide to ship system-wide installers, too. - - - - - 7ade1eef by Pier Angelo Vendrame at 2023-10-17T12:00:24+02:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - 4e175026 by Nicolas Vigier at 2023-10-17T12:00:25+02:00 MB 79: Add Mullvad Browser MAR signing keys - - - - - ffdf2559 by Pier Angelo Vendrame at 2023-10-17T12:00:25+02:00 MB 34: Hide unsafe and unwanted preferences UI about:preferences allow to override some of our defaults, that could be fingeprintable or have some other unwanted consequences. - - - - - 33cbbc4b by Pier Angelo Vendrame at 2023-10-17T12:00:25+02:00 MB 160: Disable the cookie exceptions button Besides disabling the "Delete on close checkbox", disable also the "Manage Exceptions" button when always using PBM. - - - - - 9b840580 by hackademix at 2023-10-17T12:00:26+02:00 MB 163: prevent uBlock Origin from being uninstalled/disabled - - - - - 65ed1dc2 by Richard Pospesel at 2023-10-17T12:00:26+02:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - ca7e7b89 by rui hildt at 2023-10-17T12:00:26+02:00 MB 213: Customize the search engines list - - - - - fb39df13 by hackademix at 2023-10-17T12:00:27+02:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - 30 changed files: - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/default.md - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/module.ver - browser/app/firefox.exe.manifest → browser/app/mullvadbrowser.exe.manifest - + browser/app/profile/000-mullvad-browser.js - browser/app/profile/001-base-profile.js - browser/base/content/aboutDialog.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-places.js - browser/base/content/browser.js - browser/base/content/default-bookmarks.html - browser/base/content/nsContextMenu.js - browser/base/content/overrides/app-license.html - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/utilityOverlay.js - browser/branding/branding-common.mozbuild - + browser/branding/mb-alpha/VisualElements_150.png - + browser/branding/mb-alpha/VisualElements_70.png - + browser/branding/mb-alpha/configure.sh - + browser/branding/mb-alpha/content/about-logo.png - + browser/branding/mb-alpha/content/about-logo.svg - + browser/branding/mb-alpha/content/about-logo(a)2x.png - + browser/branding/mb-alpha/content/about-wordmark.svg - + browser/branding/mb-alpha/content/about.png - + browser/branding/mb-alpha/content/aboutDialog.css - + browser/branding/mb-alpha/content/firefox-wordmark.svg The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/b3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/b3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-115.4.0esr-13.0-1-build1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new tag mullvad-browser-115.4.0esr-13.0-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.4.0esr-13.0-1] 20 commits: MB 38: Mullvad Browser configuration
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed to branch mullvad-browser-115.4.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 0b82d6ad by Pier Angelo Vendrame at 2023-10-17T11:58:14+02:00 MB 38: Mullvad Browser configuration - - - - - 889c419e by Pier Angelo Vendrame at 2023-10-17T11:58:17+02:00 MB 1: Mullvad Browser branding See also: mullvad-browser#5: Product name and directory customization mullvad-browser#12: Create new branding directories and integrate Mullvad icons+branding mullvad-browser#14: Remove Default Built-in bookmarks mullvad-browser#35: Add custom PDF icons for Windows builds mullvad-browser#48: Replace Mozilla copyright and legal trademarks in mullvadbrowser.exe metadata mullvad-browser#51: Update trademark string mullvad-browser#104: Update shipped dll metadata copyright/licensing info mullvad-browser#107: Add alpha and nightly icons - - - - - 0303cdbf by Pier Angelo Vendrame at 2023-10-17T12:00:20+02:00 fixup! MB 1: Mullvad Browser branding MB 244: Fix the link to Mullvad Browser Support - - - - - 1572b0c3 by Pier Angelo Vendrame at 2023-10-17T12:00:21+02:00 MB 20: Allow packaged-addons in PBM. We install a few addons from the distribution directory, but they are not automatically enabled for PBM mode. This commit modifies the code that installs them to also add the PBM permission to the known ones. - - - - - 1b7be33b by Pier Angelo Vendrame at 2023-10-17T12:00:21+02:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - 17b628c0 by Pier Angelo Vendrame at 2023-10-17T12:00:22+02:00 MB 37: Customization for the about dialog - - - - - cae48cd3 by Henry Wilkes at 2023-10-17T12:00:22+02:00 MB 39: Add home page about:mullvad-browser - - - - - b9fe9e6d by Pier Angelo Vendrame at 2023-10-17T12:00:22+02:00 fixup! MB 39: Add home page about:mullvad-browser MB 243: Make sure about:mullvad-browser is treated as a new tab page - - - - - 91554b7c by hackademix at 2023-10-17T12:00:23+02:00 MB 97: Remove UI cues to install new extensions. - - - - - 91c377c1 by hackademix at 2023-10-17T12:00:23+02:00 MB 47: uBlock Origin customization - - - - - 40bc3d0b by Pier Angelo Vendrame at 2023-10-17T12:00:23+02:00 MB 21: Disable the password manager This commit disables the about:login page and removes the "Login and Password" section of about:preferences. We do not do anything to the real password manager of Firefox, that is in toolkit: it contains C++ parts that make it difficult to actually prevent it from being built.. Finally, we modify the the function that opens about:login to report an error in the console so that we can quickly get a backtrace to the code that tries to use it. - - - - - 0bc79af4 by Pier Angelo Vendrame at 2023-10-17T12:00:24+02:00 MB 87: Disable the default browser box on Windows and Linux Windows and Linux will be distributed only as portable apps at the beginning, so they should not be settable as default browsers. We will need to improve the logic once we decide to ship system-wide installers, too. - - - - - 7ade1eef by Pier Angelo Vendrame at 2023-10-17T12:00:24+02:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - 4e175026 by Nicolas Vigier at 2023-10-17T12:00:25+02:00 MB 79: Add Mullvad Browser MAR signing keys - - - - - ffdf2559 by Pier Angelo Vendrame at 2023-10-17T12:00:25+02:00 MB 34: Hide unsafe and unwanted preferences UI about:preferences allow to override some of our defaults, that could be fingeprintable or have some other unwanted consequences. - - - - - 33cbbc4b by Pier Angelo Vendrame at 2023-10-17T12:00:25+02:00 MB 160: Disable the cookie exceptions button Besides disabling the "Delete on close checkbox", disable also the "Manage Exceptions" button when always using PBM. - - - - - 9b840580 by hackademix at 2023-10-17T12:00:26+02:00 MB 163: prevent uBlock Origin from being uninstalled/disabled - - - - - 65ed1dc2 by Richard Pospesel at 2023-10-17T12:00:26+02:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - ca7e7b89 by rui hildt at 2023-10-17T12:00:26+02:00 MB 213: Customize the search engines list - - - - - fb39df13 by hackademix at 2023-10-17T12:00:27+02:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - 30 changed files: - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/default.md - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/module.ver - browser/app/firefox.exe.manifest → browser/app/mullvadbrowser.exe.manifest - + browser/app/profile/000-mullvad-browser.js - browser/app/profile/001-base-profile.js - browser/base/content/aboutDialog.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-places.js - browser/base/content/browser.js - browser/base/content/default-bookmarks.html - browser/base/content/nsContextMenu.js - browser/base/content/overrides/app-license.html - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/utilityOverlay.js - browser/branding/branding-common.mozbuild - + browser/branding/mb-alpha/VisualElements_150.png - + browser/branding/mb-alpha/VisualElements_70.png - + browser/branding/mb-alpha/configure.sh - + browser/branding/mb-alpha/content/about-logo.png - + browser/branding/mb-alpha/content/about-logo.svg - + browser/branding/mb-alpha/content/about-logo(a)2x.png - + browser/branding/mb-alpha/content/about-wordmark.svg - + browser/branding/mb-alpha/content/about.png - + browser/branding/mb-alpha/content/aboutDialog.css - + browser/branding/mb-alpha/content/firefox-wordmark.svg The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/b3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/b3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 3 commits: Bug 40852: Compile lox library to wasm
by boklm (＠boklm) 17 Oct '23

17 Oct '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 3b1b0d89 by Cecylia Bocovich at 2023-10-17T15:38:41+02:00 Bug 40852: Compile lox library to wasm - - - - - f1003d94 by Cecylia Bocovich at 2023-10-17T15:38:43+02:00 Bug 40852: Add wasm-bindgen project - - - - - 94a3fda8 by Cecylia Bocovich at 2023-10-17T15:38:45+02:00 Bug 40852: Generate javascript bindings for lox-wasm - - - - - 5 changed files: - Makefile - + projects/lox-wasm/build - + projects/lox-wasm/config - + projects/wasm-bindgen/build - + projects/wasm-bindgen/config Changes: ===================================== Makefile ===================================== @@ -615,6 +615,12 @@ cargo_vendor-application-services: submodule-update cargo_vendor-cbindgen: submodule-update $(rbm) build cbindgen --step cargo_vendor --target alpha --target torbrowser-linux-x86_64 +cargo_vendor-wasm-bindgen: submodule-update + $(rbm) build wasm-bindgen --step cargo_vendor --target alpha --target torbrowser-linux-x86_64 + +cargo_vendor-lox: submodule-update + $(rbm) build lox-wasm --step cargo_vendor --target alpha --target torbrowser-linux-x86_64 + go_vendor-snowflake-alpha: submodule-update $(rbm) build snowflake --step go_vendor --target alpha --target torbrowser-linux-x86_64 ===================================== projects/lox-wasm/build ===================================== @@ -0,0 +1,43 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist +builddir=/var/tmp/build/[% project %] +mkdir -p $distdir/[% project %] +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/rust') %] +export PATH="/var/tmp/dist/rust/bin:$PATH" +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/wasm-bindgen') %] +export PATH="/var/tmp/dist/wasm-bindgen:$PATH" +[% IF c("var/linux") -%] + export LD_LIBRARY_PATH="/var/tmp/dist/rust/lib:$LD_LIBRARY_PATH" +[% END -%] +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + +# Now prepare the offline build +# Move the directory for hardcoding the path in .cargo/config +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +tar -C $builddir -xf $rootdir/[% c('input_files_by_name/cargo_vendor') %] +cd $builddir +mkdir .cargo +cat > .cargo/config << 'EOF' +[source.crates-io] +replace-with = "vendored-sources" + +[source."https://git-crysp.uwaterloo.ca/iang/lox.git"] +git = "https://git-crysp.uwaterloo.ca/iang/lox.git" +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "/var/tmp/build/lox-wasm/vendor" +EOF + +cargo build -p lox-wasm --release --frozen --target wasm32-unknown-unknown +mv target/wasm32-unknown-unknown/release/lox_wasm.wasm $distdir/[% project %] + +cd $distdir +wasm-bindgen --out-dir [% project %] --target web [% project %]/lox_wasm.wasm + +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] ===================================== projects/lox-wasm/config ===================================== @@ -0,0 +1,25 @@ +# vim: filetype=yaml sw=2 +# Remember to update also the package's hash, with the version! +version: "0.1.0" +git_url: https://gitlab.torproject.org/tpo/anti-censorship/lox-rs +git_hash: 003d9c886be3cef59c4c61db03e54a90990e2e93 +container: + use_container: 1 + +steps: + build: + filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' + input_files: + - project: container-image + pkg_type: build + - project: rust + name: rust + pkg_type: build + - project: wasm-bindgen + name: wasm-bindgen + pkg_type: build + - name: cargo_vendor + project: lox-wasm + pkg_type: cargo_vendor + norec: + sha256sum: c4d31f971d406688a08414d471bca6ae2dcea4ce9507ab44a4e54324768c2b22 ===================================== projects/wasm-bindgen/build ===================================== @@ -0,0 +1,44 @@ +#!/bin/bash +[% c("var/set_default_env") -%] +distdir=/var/tmp/dist +builddir=/var/tmp/build/[% project %] +mkdir -p $distdir/[% project %] +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/rust') %] +export PATH="/var/tmp/dist/rust/bin:$PATH" +[% IF c("var/linux") -%] + export LD_LIBRARY_PATH="/var/tmp/dist/rust/lib:$LD_LIBRARY_PATH" +[% END -%] +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] + +# Now prepare the offline build +# Move the directory for hardcoding the path in .cargo/config +mv /var/tmp/build/[% project %]-[% c('version') %] $builddir +tar -C $builddir -xf $rootdir/[% c('input_files_by_name/cargo_vendor') %] +cd $builddir +cat > .cargo/config << 'EOF' +[source.crates-io] +replace-with = "vendored-sources" + +[source."git+https://github.com/alexcrichton/raytracer?branch=update-deps"] +git = "https://github.com/alexcrichton/raytracer" +branch = "update-deps" +replace-with = "vendored-sources" + +[source."git+https://github.com/rustwasm/weedle.git"] +git = "https://github.com/rustwasm/weedle.git" +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "/var/tmp/build/wasm-bindgen/vendor" +EOF + +cargo build -p wasm-bindgen-cli --release --frozen --target x86_64-unknown-linux-gnu +cd $builddir +mv target/x86_64-unknown-linux-gnu/release/wasm-bindgen $distdir/[% project %] + +cd $distdir +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] ===================================== projects/wasm-bindgen/config ===================================== @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: 0.2.86 +git_url: https://github.com/cohosh/wasm-bindgen +git_hash: ecc5ca153cda278bfcebc99c157fb4732eb75e6e +container: + use_container: 1 + +steps: + build: + filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' + input_files: + - project: container-image + - project: rust + name: rust + - name: cargo_vendor + project: wasm-bindgen + pkg_type: cargo_vendor + norec: + sha256sum: 926e938cc4eebf2f5c99f34170fddc5aa7b12445fb379d768eb51aaae3b305a3 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-115.4.0esr-13.5-1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new branch mullvad-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-115.4.0esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new branch mullvad-browser-115.4.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag base-browser-115.4.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new tag base-browser-115.4.0esr-13.5-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/base-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag base-browser-115.4.0esr-13.0-1-build1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new tag base-browser-115.4.0esr-13.0-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/base-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.4.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new tag tor-browser-115.4.0esr-13.5-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.4.0esr-13.5-1] 152 commits: Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed to branch tor-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: cd27e064 by Eitan Isaacson at 2023-10-17T11:38:42+02:00 Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie Differential Revision: https://phabricator.services.mozilla.com/D179737 - - - - - 3e31cd21 by Pier Angelo Vendrame at 2023-10-17T11:38:43+02:00 Bug 1832523 - Allow using NSS to sign and verify MAR signatures. r=application-update-reviewers,glandium,bytesized Allow using NSS for checking MAR signatures also in platforms where OS-native APIs are used by default, i.e., macOS and Windows. Differential Revision: https://phabricator.services.mozilla.com/D177743 - - - - - 3885ed82 by Pier Angelo Vendrame at 2023-10-17T11:38:44+02:00 Bug 1849129: Prevent exceptions caused by extensions from interrupting the SearchService initialization. r=search-reviewers,Standard8 Differential Revision: https://phabricator.services.mozilla.com/D186456 - - - - - 02385c04 by Emilio Cobos Álvarez at 2023-10-17T11:38:44+02:00 Bug 1853731 - Use html:img for message-bar-icon. r=Gijs,dao,settings-reviewers,desktop-theme-reviewers,sfoster Differential Revision: https://phabricator.services.mozilla.com/D188521 - - - - - 215e164c by Pier Angelo Vendrame at 2023-10-17T11:38:44+02:00 Bug 1854117 - Sort the DLL blocklist flags. r=mossop,win-reviewers,gstoll Differential Revision: https://phabricator.services.mozilla.com/D188716 - - - - - 3e02d386 by Henry Wilkes at 2023-10-17T11:38:45+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - bc8f0b3d by Henry Wilkes at 2023-10-17T11:44:42+02:00 fixup! Bug 41454: Move focus after calling openPreferences for a sub-category. Bug 42167: Make the auto-focus more reliable. No longer use the setTimeout to wait a loop, but instead wait for the "load" event. - - - - - 34728c08 by Henry Wilkes at 2023-10-17T11:44:44+02:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - da94a4e0 by Pier Angelo Vendrame at 2023-10-17T11:44:45+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - 83292cac by Marco Simonelli at 2023-10-17T11:44:45+02:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - ea2c85fe by Marco Simonelli at 2023-10-17T11:44:45+02:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - 55294780 by Marco Simonelli at 2023-10-17T11:44:46+02:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - 9280b48c by Marco Simonelli at 2023-10-17T11:44:46+02:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - 054fdec1 by Marco Simonelli at 2023-10-17T11:44:46+02:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - 28fce705 by Marco Simonelli at 2023-10-17T11:44:47+02:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - eeba2e1e by hackademix at 2023-10-17T11:44:47+02:00 Bug 41854: Allow overriding download spam protection. - - - - - 066afd9e by Gaba at 2023-10-17T11:44:47+02:00 Adding issue and merge request templates - - - - - 85da1d93 by Pier Angelo Vendrame at 2023-10-17T11:44:48+02:00 Base Browser's .mozconfigs. 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 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION 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 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - e9211787 by Pier Angelo Vendrame at 2023-10-17T11:44:48+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - 57b30543 by Pier Angelo Vendrame at 2023-10-17T11:44:49+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 518d9afc by Dan Ballard at 2023-10-17T11:44:49+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - ec476fa0 by Matthew Finkel at 2023-10-17T11:44:49+02:00 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. - - - - - 22048f29 by Matthew Finkel at 2023-10-17T11:44:50+02:00 Bug 28125: Prevent non-Necko network connections - - - - - 563dbc72 by Mike Perry at 2023-10-17T11:44:50+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 6ed9bd8b by Alex Catarineu at 2023-10-17T11:44:50+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - 623e2be0 by Georg Koppen at 2023-10-17T11:44:51+02:00 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. - - - - - 8f27f5ba by Kathy Brade at 2023-10-17T11:44:51+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 64e8a64a by Kathy Brade at 2023-10-17T11:44:51+02:00 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. - - - - - a1f00436 by Alex Catarineu at 2023-10-17T11:44:52+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 2d96fa07 by Kathy Brade at 2023-10-17T11:44:52+02:00 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. Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - 16c1091e by Arthur Edelstein at 2023-10-17T11:44:52+02:00 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. - - - - - c5cb92cf by Alex Catarineu at 2023-10-17T11:44:53+02:00 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. - - - - - 55e68b91 by cypherpunks1 at 2023-10-17T11:44:53+02:00 Bug 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - 8976446a by Pier Angelo Vendrame at 2023-10-17T11:44:53+02:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - 42f9450c by Georg Koppen at 2023-10-17T11:44:54+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 1c07ca18 by Alex Catarineu at 2023-10-17T11:44:54+02:00 Bug 28369: Stop shipping pingsender executable - - - - - 5824580a by cypherpunks1 at 2023-10-17T11:44:54+02:00 Bug 41568: Disable LaterRun - - - - - e17d8b30 by cypherpunks1 at 2023-10-17T11:44:55+02:00 Bug 40717: Hide Windows SSO in settings - - - - - 1f387902 by Pier Angelo Vendrame at 2023-10-17T11:44:55+02:00 Bug 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - 39710c2d by cypherpunks1 at 2023-10-17T11:44:55+02:00 Bug 40175: Add origin attributes to about:reader top-level requests - - - - - d075559d by Richard Pospesel at 2023-10-17T11:44:56+02:00 Bug 41327: Disable UrlbarProviderInterventions - - - - - 4c47d24f by Richard Pospesel at 2023-10-17T11:44:56+02:00 Bug 42037: Disable about:firefoxview page - - - - - 419d2d3f by Mike Perry at 2023-10-17T11:44:56+02:00 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 <ffmancera(a)riseup.net>) 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 directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - 5d6fbc54 by Pier Angelo Vendrame at 2023-10-17T11:44:57+02:00 fixup! Firefox preference overrides. Bug 41496 (part 2): Pref review for 115/13.0. Added a couple of prefs that were suggested in the issue and I initially missed. Bug 42147: Add browser.helperApps.deleteTempFileOnExit to our profile - - - - - df286211 by Pier Angelo Vendrame at 2023-10-17T11:44:57+02:00 fixup! Firefox preference overrides. Bug 41576: Make sure weather and addon suggestions stay off. Better to set them already for the next ESR. - - - - - 3d458de7 by Henry Wilkes at 2023-10-17T11:44:57+02:00 fixup! Firefox preference overrides. Bug 41736: Hide NoScript extension by default. We also hide the unified-extension-button if it would be empty. - - - - - 425d8953 by Richard Pospesel at 2023-10-17T11:44:58+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - 7d0bd45c by Pier Angelo Vendrame at 2023-10-17T11:44:58+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - 001a12c8 by Alex Catarineu at 2023-10-17T11:44:58+02:00 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. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - c91e1aa1 by Alex Catarineu at 2023-10-17T11:44:59+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 8d1e9258 by Alex Catarineu at 2023-10-17T11:45:01+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - a4ef8628 by Alex Catarineu at 2023-10-17T11:45:01+02:00 Bug 26345: Hide tracking protection UI - - - - - a22c5977 by Pier Angelo Vendrame at 2023-10-17T11:45:01+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - 569f894d by Alex Catarineu at 2023-10-17T11:45:02+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 275370bf by Mike Perry at 2023-10-17T11:45:02+02:00 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. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - 23a37e5a by Igor Oliveira at 2023-10-17T11:45:02+02:00 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. - - - - - c7ea9267 by Pier Angelo Vendrame at 2023-10-17T11:45:03+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 51423e12 by Matthew Finkel at 2023-10-17T11:45:03+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - f93cc9e1 by cypherpunks1 at 2023-10-17T11:45:03+02:00 Bug 33955: When copying an image only copy the image contents to the clipboard - - - - - aa8a70d2 by cypherpunks1 at 2023-10-17T11:45:04+02:00 Bug 41791: Omit the source URL when copying page contents to the clipboard - - - - - 7041d1d7 by Pier Angelo Vendrame at 2023-10-17T11:45:04+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - fc2f21a0 by Henry Wilkes at 2023-10-17T11:45:04+02:00 fixup! Base Browser strings Bug 41581: Add strings for changing the visibility of the NoScript toolbar button. - - - - - fa657801 by hackademix at 2023-10-17T11:45:05+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - c571fe88 by hackademix at 2023-10-17T11:45:05+02:00 Bug 41434: Letterboxing, improve logging. - - - - - 9d99ad64 by hackademix at 2023-10-17T11:45:05+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - c99234ff by hackademix at 2023-10-17T11:45:06+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 4efda399 by hackademix at 2023-10-17T11:45:06+02:00 Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping - - - - - 78ca1727 by hackademix at 2023-10-17T11:45:06+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping Bug 41259: Do not interfere with devtools responsive mode sizing. - - - - - 0a6b81bc by hackademix at 2023-10-17T11:45:07+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - cd8b4f32 by Pier Angelo Vendrame at 2023-10-17T11:45:07+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 06b281df by p13dz at 2023-10-17T11:45:08+02:00 Bug 40283: Workaround for the file upload bug - - - - - 85ca625f by Arthur Edelstein at 2023-10-17T11:45:08+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 6b3f5364 by cypherpunks1 at 2023-10-17T11:45:08+02:00 Bug 41740: Change the RFP value of devicePixelRatio to 2 - - - - - de619679 by Pier Angelo Vendrame at 2023-10-17T11:45:09+02:00 Bug 41739: Remove "Website appearance" from about:preferences. It is ignored because of RFP and it is confusing for users. - - - - - 1a6f7830 by cypherpunks1 at 2023-10-17T11:45:09+02:00 Bug 41881: Don't persist custom network requests on private windows - - - - - 3a08b4ea by hackademix at 2023-10-17T11:45:09+02:00 Bug 42019: Empty browser's clipboard on browser shutdown - - - - - ca679b4e by hackademix at 2023-10-17T11:45:10+02:00 Bug 42084: Ensure English spoofing works even if preferences are set out of order. - - - - - ee3cf4c1 by Pier Angelo Vendrame at 2023-10-17T11:45:10+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - bcddea4b by Henry Wilkes at 2023-10-17T11:45:10+02:00 Bug 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - c96ba6a5 by Kathy Brade at 2023-10-17T11:45:11+02:00 Bug 4234: Use the Firefox Update Process for Base Browser. 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 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base 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 Base 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. - - - - - 047a3b41 by Pier Angelo Vendrame at 2023-10-17T11:45:11+02:00 Bug 42061: Create an alpha update channel. - - - - - cc242472 by Nicolas Vigier at 2023-10-17T11:45:11+02:00 Bug 41682: Add base-browser nightly mar signing key - - - - - e2f12cae by hackademix at 2023-10-17T11:45:12+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - ef1ff9a9 by Pier Angelo Vendrame at 2023-10-17T11:45:12+02:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - 35b61f3e by Alex Catarineu at 2023-10-17T11:45:12+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - 775f63a0 by Matthew Finkel at 2023-10-17T11:45:13+02:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 2484e80e by Henry Wilkes at 2023-10-17T11:45:13+02:00 fixup! Bug 41598: Prevent NoScript from being removed/disabled. Bug 41736: Add a isNoScript property to Extension class. - - - - - d5ad86b1 by Henry Wilkes at 2023-10-17T11:46:30+02:00 Bug 41736: Hide NoScript extension's toolbar button by default. This hides it from both the toolbar and the unified extensions panel. We also hide the unified-extension-button if the panel would be empty: not including the NoScript button when it is hidden. As a result, this will be hidden by default until a user installs another extension (or shows the NoScript button and unpins it). - - - - - b3671221 by hackademix at 2023-10-17T11:46:31+02:00 Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - f14c0f21 by Pier Angelo Vendrame at 2023-10-17T11:46:32+02:00 Bug 40925: Implemented the Security Level component 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. Bug 40125: Expose Security Level pref in GeckoView - - - - - 80100b80 by Henry Wilkes at 2023-10-17T11:46:32+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 41973: re-align popup panel to the anchor's corner edge. - - - - - bd30dffe by Pier Angelo Vendrame at 2023-10-17T11:46:32+02:00 Bug 40926: Implemented the New Identity feature - - - - - 64925e7c by hackademix at 2023-10-17T11:46:33+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 41765: Force about:privatebrowsing in new identity window. - - - - - e33ff56e by Henry Wilkes at 2023-10-17T11:46:33+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42166: Give new identity dialog an accessible name. - - - - - 27b3a865 by Henry Wilkes at 2023-10-17T11:46:33+02:00 Bug 41736: Customize toolbar for base-browser. - - - - - de3c68fe by Henry Wilkes at 2023-10-17T11:46:34+02:00 fixup! Bug 41736: Customize toolbar for base-browser. Bug 41736: Stop placing the NoScript button in the palette, and let it go to the toolbar by default when shown. - - - - - 92be3c0e by Henry Wilkes at 2023-10-17T11:46:34+02:00 fixup! Bug 41736: Customize toolbar for base-browser. Bug 41581: Keep NoScript button in the toolbar (but hidden) by default. Also includes some migration. - - - - - b3beae2d by Pier Angelo Vendrame at 2023-10-17T11:46:35+02:00 Bug 42027: Base Browser migration procedures. This commit implmenents the the Base Browser's version of _migrateUI. - - - - - 08243f56 by Richard Pospesel at 2023-10-17T11:46:35+02:00 Bug 41649: Create rebase and security backport gitlab issue templates - - - - - b035a588 by Richard Pospesel at 2023-10-17T11:46:35+02:00 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - 87c671f5 by Henry Wilkes at 2023-10-17T11:46:36+02:00 Bug 41803: Add some developer tools for working on tor-browser. - - - - - eb7e38c0 by Kathy Brade at 2023-10-17T11:46:36+02:00 Bug 11641: Disable remoting by default. 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. - - - - - 85aba3be by Alex Catarineu at 2023-10-17T11:46:36+02:00 Add TorStrings module for localization - - - - - c5f069ae by Henry Wilkes at 2023-10-17T11:46:37+02:00 Tor Browser strings This commit adds all the strings needed for Tor Browser patches. - - - - - 04a15c84 by Henry Wilkes at 2023-10-17T11:46:37+02:00 Tor Browser localization migration scripts. - - - - - b1b8cd54 by Mike Perry at 2023-10-17T11:46:37+02:00 Bug 2176: Rebrand Firefox to TorBrowser See also Bugs #5194, #7187, #8115, #8219. This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. Also fix bug 27905. Bug 25702: Update Tor Browser icon to follow design guidelines - Updated all of the branding in /browser/branding/official with new 'stable' icon series. - Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory - Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654) - Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory - Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico) - Added default256.png and default512.png icons - Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon - Use the Tor Browser icon within devtools/client/themes/images/. Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. Bug 28196: preparations for using torbutton tor-browser-brand.ftl A small change to Fluent FileSource class is required so that we can register a new source without its supported locales being counted as available locales for the browser. Bug 31803: Replaced about:debugging logo with flat version 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. Bug 32092: Fix Tor Browser Support link in preferences For bug 40562, we moved onionPattern* from bug 27476 to here, as about:tor needs these files but it is included earlier. Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one Bug 42088: New application icons (used in-app and on linux). Bug 42087: New application icons (windows). - - - - - 74c6185b by sanketh at 2023-10-17T11:46:38+02:00 Bug 40209: Implement Basic Crypto Safety Adds a CryptoSafety actor which detects when you've copied a crypto address from a HTTP webpage and shows a warning. Closes #40209. Bug 40428: Fix string attribute names - - - - - 2bd2f08b by Mike Perry at 2023-10-17T11:46:38+02:00 TB3: Tor Browser's official .mozconfigs. Also: Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option 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. Add --enable-tor-browser-update build option Bug 40793: moved Tor configuration options from old-configure.in to moz.configure Bug 41584: Move some configuration options to base-browser level - - - - - 45252975 by Henry Wilkes at 2023-10-17T11:46:38+02:00 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - 32273632 by Pier Angelo Vendrame at 2023-10-17T11:46:39+02:00 Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Before reordering patches, we used to keep the Tor-related patches (torbutton and tor-launcher) at the beginning. After that issue, we decided to move them towards the end. In addition to that, we have decided to move Tor Browser-only preferences there, too, to make Base Browser-only fixups easier to apply. - - - - - f76b0e07 by Pier Angelo Vendrame at 2023-10-17T11:46:39+02:00 Bug 13252: Customize profile management on macOS On macOS we allow both portable mode and system installation. However, in the latter case, we customize Firefox's directories to match the hierarchy we use for the portable mode. Also, display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. - - - - - d1bdafd9 by Pier Angelo Vendrame at 2023-10-17T11:46:39+02:00 Bug 40933: Add tor-launcher functionality Bug 41926: Reimplement the control port - - - - - f8a57dd1 by Pier Angelo Vendrame at 2023-10-17T11:46:40+02:00 fixup! Bug 40933: Add tor-launcher functionality Bug 42160: Allow specifying a TOR_PROVIDER=none to configure only the proxy settings during the TorProviderBuilder initialization. - - - - - c57b2133 by Richard Pospesel at 2023-10-17T11:46:40+02:00 Bug 40597: Implement TorSettings module - migrated in-page settings read/write implementation from about:preferences#tor to the TorSettings module - TorSettings initially loads settings from the tor daemon, and saves them to firefox prefs - TorSettings notifies observers when a setting has changed; currently only QuickStart notification is implemented for parity with previous preference notify logic in about:torconnect and about:preferences#tor - about:preferences#tor, and about:torconnect now read and write settings thorugh the TorSettings module - all tor settings live in the torbrowser.settings.* preference branch - removed unused pref modify permission for about:torconnect content page from AsyncPrefs.jsm Bug 40645: Migrate Moat APIs to Moat.jsm module - - - - - 78e49358 by Arthur Edelstein at 2023-10-17T11:46:40+02:00 Bug 3455: Add DomainIsolator, for isolating circuit by domain. Add an XPCOM component that registers a ProtocolProxyChannelFilter which sets the username/password for each web request according to url bar domain. Bug 9442: Add New Circuit button Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ. Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce. Bug 19206: Clear out the domain isolator state on `New Identity`. Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes Bug 21745: Fix handling of catch-all circuit Bug 41741: Refactor the domain isolator and new circuit - - - - - a9d96306 by Henry Wilkes at 2023-10-17T11:46:41+02:00 Bug 41600: Add a tor circuit display panel. - - - - - a4d912cf by Henry Wilkes at 2023-10-17T11:46:41+02:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 41973: re-align popup panel to the anchor's corner edge. - - - - - 9ca996f6 by hackademix at 2023-10-17T11:46:41+02:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs - - - - - 6628cb16 by Amogh Pradeep at 2023-10-17T11:46:42+02:00 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 - - - - - 07f40bf9 by Matthew Finkel at 2023-10-17T11:46:42+02:00 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. - - - - - a0cb379f by Kathy Brade at 2023-10-17T11:46:42+02:00 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. - - - - - cf2ba22e by Pier Angelo Vendrame at 2023-10-17T11:46:43+02:00 Bug 40807: Added QRCode.js to toolkit/modules - - - - - a9f557f3 by Richard Pospesel at 2023-10-17T11:46:43+02:00 Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection This patch adds a new about:preferences#connection 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 Bug 40774: Update about:preferences page to match new UI designs - - - - - ad1c4d02 by Pier Angelo Vendrame at 2023-10-17T11:46:43+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42155: Drop the unused code for the old bridge removal warning - - - - - e31ce9f7 by Pier Angelo Vendrame at 2023-10-17T11:46:44+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41974: Update the rule for de-emphasized text in bridge addresses - - - - - f6b8e4fa by Pier Angelo Vendrame at 2023-10-17T11:46:44+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41912: Hide "Use Current Bridges" when we do not have any bridge strings. - - - - - 7abf5a2c by Pier Angelo Vendrame at 2023-10-17T11:46:44+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41976: Fix the padding of the collapsed bridge cards. - - - - - 2594a542 by Richard Pospesel at 2023-10-17T11:46:45+02:00 Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor Bug 40773: Update the about:torconnect frontend page to match additional UI flows. Bug 41608: Add a toolbar status button and a urlbar "Connect" button. - - - - - 5b5bf6b2 by hackademix at 2023-10-17T11:46:45+02:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41766: Sanitize about:torconnect redirects. - - - - - 5f09649b by Henry Wilkes at 2023-10-17T11:46:45+02:00 Bug 7494: Create local home page for TBB. Bug 41333: Update about:tor to new design. Including: + make the favicon match the branding icon. + make the location bar show a search icon. - - - - - 057dce90 by Arthur Edelstein at 2023-10-17T11:46:46+02:00 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. - - - - - 1febd7e6 by Pier Angelo Vendrame at 2023-10-17T11:46:48+02:00 Bug 41668: Tweaks to the Base Browser updater for Tor Browser This commit was once part of "Bug 4234: Use the Firefox Update Process for Tor Browser.". However, some parts of it were not needed for Base Browser and some derivative browsers. Therefore, we extracted from that commit the parts for Tor Browser legacy, and we add them back to the patch set with this commit. - - - - - e8606d95 by Kathy Brade at 2023-10-17T11:46:49+02:00 Bug 12647: Support symlinks in the updater. - - - - - 02d53800 by Kathy Brade at 2023-10-17T11:46:49+02:00 Bug 19121: reinstate the update.xml hash check This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert most 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)." We kept the addition to the AppConstants API in case other JS code references it in the future. - - - - - 6c24cc72 by Kathy Brade at 2023-10-17T11:46:49+02:00 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. - - - - - 68b68661 by Georg Koppen at 2023-10-17T11:46:50+02:00 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 - - - - - 671877e1 by Mike Perry at 2023-10-17T11:46:50+02:00 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. squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40494: Update Startpage search provider squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40438: Add Blockchair as a search engine 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. - - - - - 81eb5071 by Alex Catarineu at 2023-10-17T11:46:50+02:00 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. - - - - - 8b15dd84 by Henry Wilkes at 2023-10-17T11:46:51+02:00 Bug 41906: Hide DNS over HTTPS preferences. - - - - - 53008b50 by Richard Pospesel at 2023-10-17T11:46:51+02:00 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. - - - - - a8e12d13 by Kathy Brade at 2023-10-17T11:46:51+02:00 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. - - - - - 80ef7fc1 by Alex Catarineu at 2023-10-17T11:46:52+02:00 Bug 21952: Implement Onion-Location Whenever a valid Onion-Location HTTP header (or corresponding HTML <meta> 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. - - - - - 7d8c054d by Pier Angelo Vendrame at 2023-10-17T11:46:52+02:00 Bug 40458: Implement .tor.onion aliases We have enabled HTTPS-Only mode, therefore we do not need HTTPS-Everywhere anymore. However, we want to keep supporting .tor.onion aliases (especially for securedrop). Therefore, in this patch we implemented the parsing of HTTPS-Everywhere rulesets, and the redirect of .tor.onion domains. Actually, Tor Browser believes they are actual domains. We change them on the fly on the SOCKS proxy requests to resolve the domain, and on the code that verifies HTTPS certificates. - - - - - 5f8029ff by Pier Angelo Vendrame at 2023-10-17T11:46:52+02:00 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. - - - - - 99cf3ff8 by Pier Angelo Vendrame at 2023-10-17T11:46:53+02:00 Bug 41435: Add a Tor Browser migration function For now this function only deletes old language packs for which we are already packaging the strings with the application. - - - - - 77a722dc by Henry Wilkes at 2023-10-17T11:46:53+02:00 Bug 42110: Add TorUIUtils module for common tor component methods. - - - - - a6a22760 by Dan Ballard at 2023-10-17T11:46:53+02:00 Bug 40701: Add security warning when downloading a file Shown in the downloads panel, about:downloads and places.xhtml. - - - - - 651df4dd by Henry Wilkes at 2023-10-17T11:46:54+02:00 Bug 41736: Customize toolbar for tor-browser. - - - - - e24e0656 by hackademix at 2023-10-17T11:46:54+02:00 Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - accd2038 by Henry Wilkes at 2023-10-17T11:46:54+02:00 Customize moz-toggle for tor-browser. - - - - - 58382e90 by Richard Pospesel at 2023-10-17T11:46:55+02:00 Bug 41822: Unconditionally disable default browser UX in about:preferences - - - - - e1b11657 by Henry Wilkes at 2023-10-17T11:46:55+02:00 Bug 42072: 2023 year end campaign for about:tor. - - - - - 30 changed files: - .eslintignore - .gitignore - + .gitlab/issue_templates/Backport Android Security Fixes.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - accessible/android/SessionAccessibility.cpp - accessible/android/SessionAccessibility.h - accessible/ipc/DocAccessibleParent.cpp - accessible/ipc/DocAccessibleParent.h - accessible/ipc/moz.build - + browser/actors/AboutTBUpdateChild.jsm - + browser/actors/AboutTBUpdateParent.jsm - + browser/actors/CryptoSafetyChild.jsm - + browser/actors/CryptoSafetyParent.jsm - − browser/actors/RFPHelperChild.sys.mjs - − browser/actors/RFPHelperParent.sys.mjs - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/moz.build - browser/app/permissions - + browser/app/profile/000-tor-browser.js - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/20523f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/20523f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.4.0esr-13.0-1-build1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new tag tor-browser-115.4.0esr-13.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.4.0esr-13.5-1-build1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new tag base-browser-115.4.0esr-13.5-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-115.4.0esr-13.0-1-build1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new tag base-browser-115.4.0esr-13.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-115.4.0esr-13.5-1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new branch base-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-115.4.0esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new branch base-browser-115.4.0esr-13.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.4.0esr-13.0-1] 152 commits: Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed to branch tor-browser-115.4.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: cd27e064 by Eitan Isaacson at 2023-10-17T11:38:42+02:00 Bug 1819160 - Map Android ids to doc/accessible id pairs. r=Jamie Differential Revision: https://phabricator.services.mozilla.com/D179737 - - - - - 3e31cd21 by Pier Angelo Vendrame at 2023-10-17T11:38:43+02:00 Bug 1832523 - Allow using NSS to sign and verify MAR signatures. r=application-update-reviewers,glandium,bytesized Allow using NSS for checking MAR signatures also in platforms where OS-native APIs are used by default, i.e., macOS and Windows. Differential Revision: https://phabricator.services.mozilla.com/D177743 - - - - - 3885ed82 by Pier Angelo Vendrame at 2023-10-17T11:38:44+02:00 Bug 1849129: Prevent exceptions caused by extensions from interrupting the SearchService initialization. r=search-reviewers,Standard8 Differential Revision: https://phabricator.services.mozilla.com/D186456 - - - - - 02385c04 by Emilio Cobos Álvarez at 2023-10-17T11:38:44+02:00 Bug 1853731 - Use html:img for message-bar-icon. r=Gijs,dao,settings-reviewers,desktop-theme-reviewers,sfoster Differential Revision: https://phabricator.services.mozilla.com/D188521 - - - - - 215e164c by Pier Angelo Vendrame at 2023-10-17T11:38:44+02:00 Bug 1854117 - Sort the DLL blocklist flags. r=mossop,win-reviewers,gstoll Differential Revision: https://phabricator.services.mozilla.com/D188716 - - - - - 3e02d386 by Henry Wilkes at 2023-10-17T11:38:45+02:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - bc8f0b3d by Henry Wilkes at 2023-10-17T11:44:42+02:00 fixup! Bug 41454: Move focus after calling openPreferences for a sub-category. Bug 42167: Make the auto-focus more reliable. No longer use the setTimeout to wait a loop, but instead wait for the "load" event. - - - - - 34728c08 by Henry Wilkes at 2023-10-17T11:44:44+02:00 Bug 41483: Remove the firefox override for appstrings.properties Remove this patch after upstream bugzilla bug 1790187 - - - - - da94a4e0 by Pier Angelo Vendrame at 2023-10-17T11:44:45+02:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - 83292cac by Marco Simonelli at 2023-10-17T11:44:45+02:00 Bug 41459: WebRTC fails to build under mingw (Part 1) - properly define NOMINMAX for just MSVC builds - - - - - ea2c85fe by Marco Simonelli at 2023-10-17T11:44:45+02:00 Bug 41459: WebRTC fails to build under mingw (Part 2) - fixes required to build third_party/libwebrtc - - - - - 55294780 by Marco Simonelli at 2023-10-17T11:44:46+02:00 Bug 41459: WebRTC fails to build under mingw (Part 3) - fixes required to build third_party/sipcc - - - - - 9280b48c by Marco Simonelli at 2023-10-17T11:44:46+02:00 Bug 41459: WebRTC fails to build under mingw (Part 4) - fixes requried to build netwerk/sctp - - - - - 054fdec1 by Marco Simonelli at 2023-10-17T11:44:46+02:00 Bug 41459: WebRTC fails to build under mingw (Part 5) - fixes required to build dom/media/webrtc - - - - - 28fce705 by Marco Simonelli at 2023-10-17T11:44:47+02:00 Bug 41459: WebRTC fails to build under mingw (Part 6) - fixes required to build dom/media/systemservices - - - - - eeba2e1e by hackademix at 2023-10-17T11:44:47+02:00 Bug 41854: Allow overriding download spam protection. - - - - - 066afd9e by Gaba at 2023-10-17T11:44:47+02:00 Adding issue and merge request templates - - - - - 85da1d93 by Pier Angelo Vendrame at 2023-10-17T11:44:48+02:00 Base Browser's .mozconfigs. 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 21849: Don't allow SSL key logging. Bug 25741 - TBA: Disable features at compile-time Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION 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 29859: Disable HLS support for now Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 41584: Move some configuration options to base-browser level - - - - - e9211787 by Pier Angelo Vendrame at 2023-10-17T11:44:48+02:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - 57b30543 by Pier Angelo Vendrame at 2023-10-17T11:44:49+02:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 518d9afc by Dan Ballard at 2023-10-17T11:44:49+02:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - ec476fa0 by Matthew Finkel at 2023-10-17T11:44:49+02:00 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. - - - - - 22048f29 by Matthew Finkel at 2023-10-17T11:44:50+02:00 Bug 28125: Prevent non-Necko network connections - - - - - 563dbc72 by Mike Perry at 2023-10-17T11:44:50+02:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 6ed9bd8b by Alex Catarineu at 2023-10-17T11:44:50+02:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - 623e2be0 by Georg Koppen at 2023-10-17T11:44:51+02:00 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. - - - - - 8f27f5ba by Kathy Brade at 2023-10-17T11:44:51+02:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 64e8a64a by Kathy Brade at 2023-10-17T11:44:51+02:00 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. - - - - - a1f00436 by Alex Catarineu at 2023-10-17T11:44:52+02:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 2d96fa07 by Kathy Brade at 2023-10-17T11:44:52+02:00 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. Bug 41662: Disable about:sync-logs Even though we disable sync by default with `identity.fxaccounts.enabled`, this about: page is still avilable. We could throw an exception on the constructor of the related component, but it would result only in an error in the console, without a visible "this address does not look right" error page. If we fix the issues with MOZ_SERVICES_SYNC, we can restore the component. - - - - - 16c1091e by Arthur Edelstein at 2023-10-17T11:44:52+02:00 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. - - - - - c5cb92cf by Alex Catarineu at 2023-10-17T11:44:53+02:00 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. - - - - - 55e68b91 by cypherpunks1 at 2023-10-17T11:44:53+02:00 Bug 41092: Add a RemoteSettings JSON dump for query-stripping - - - - - 8976446a by Pier Angelo Vendrame at 2023-10-17T11:44:53+02:00 Bug 41635: Disable the Normandy component Do not include Normandy at all whenever MOZ_NORMANDY is False. - - - - - 42f9450c by Georg Koppen at 2023-10-17T11:44:54+02:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 1c07ca18 by Alex Catarineu at 2023-10-17T11:44:54+02:00 Bug 28369: Stop shipping pingsender executable - - - - - 5824580a by cypherpunks1 at 2023-10-17T11:44:54+02:00 Bug 41568: Disable LaterRun - - - - - e17d8b30 by cypherpunks1 at 2023-10-17T11:44:55+02:00 Bug 40717: Hide Windows SSO in settings - - - - - 1f387902 by Pier Angelo Vendrame at 2023-10-17T11:44:55+02:00 Bug 41599: Always return an empty string as network ID Firefox computes an internal network ID used to detect network changes and act consequently (e.g., to improve WebSocket UX). However, there are a few ways to get this internal network ID, so we patch them out, to be sure any new code will not be able to use them and possibly link users. We also sent a patch to Mozilla to seed the internal network ID, to prevent any accidental leak in the future. Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1817756 - - - - - 39710c2d by cypherpunks1 at 2023-10-17T11:44:55+02:00 Bug 40175: Add origin attributes to about:reader top-level requests - - - - - d075559d by Richard Pospesel at 2023-10-17T11:44:56+02:00 Bug 41327: Disable UrlbarProviderInterventions - - - - - 4c47d24f by Richard Pospesel at 2023-10-17T11:44:56+02:00 Bug 42037: Disable about:firefoxview page - - - - - 419d2d3f by Mike Perry at 2023-10-17T11:44:56+02:00 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 <ffmancera(a)riseup.net>) 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 directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - 5d6fbc54 by Pier Angelo Vendrame at 2023-10-17T11:44:57+02:00 fixup! Firefox preference overrides. Bug 41496 (part 2): Pref review for 115/13.0. Added a couple of prefs that were suggested in the issue and I initially missed. Bug 42147: Add browser.helperApps.deleteTempFileOnExit to our profile - - - - - df286211 by Pier Angelo Vendrame at 2023-10-17T11:44:57+02:00 fixup! Firefox preference overrides. Bug 41576: Make sure weather and addon suggestions stay off. Better to set them already for the next ESR. - - - - - 3d458de7 by Henry Wilkes at 2023-10-17T11:44:57+02:00 fixup! Firefox preference overrides. Bug 41736: Hide NoScript extension by default. We also hide the unified-extension-button if it would be empty. - - - - - 425d8953 by Richard Pospesel at 2023-10-17T11:44:58+02:00 Bug 41659: Add canonical color definitions to base-browser - - - - - 7d0bd45c by Pier Angelo Vendrame at 2023-10-17T11:44:58+02:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - 001a12c8 by Alex Catarineu at 2023-10-17T11:44:58+02:00 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. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - c91e1aa1 by Alex Catarineu at 2023-10-17T11:44:59+02:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - 8d1e9258 by Alex Catarineu at 2023-10-17T11:45:01+02:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - a4ef8628 by Alex Catarineu at 2023-10-17T11:45:01+02:00 Bug 26345: Hide tracking protection UI - - - - - a22c5977 by Pier Angelo Vendrame at 2023-10-17T11:45:01+02:00 Bug 9173: Change the default Firefox profile directory to be relative. This commit makes Firefox look for the default profile directory in a directory relative to the binary path. The directory can be specified through the --with-relative-data-dir. This is relative to the same directory as the firefox main binary for Linux and Windows. On macOS, we remove Contents/MacOS from it. Or, in other words, the directory is relative to the application bundle. This behavior can be overriden at runtime, by placing a file called system-install adjacent to the firefox main binary (also on macOS). - - - - - 569f894d by Alex Catarineu at 2023-10-17T11:45:02+02:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 275370bf by Mike Perry at 2023-10-17T11:45:02+02:00 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. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - 23a37e5a by Igor Oliveira at 2023-10-17T11:45:02+02:00 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. - - - - - c7ea9267 by Pier Angelo Vendrame at 2023-10-17T11:45:03+02:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 51423e12 by Matthew Finkel at 2023-10-17T11:45:03+02:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - f93cc9e1 by cypherpunks1 at 2023-10-17T11:45:03+02:00 Bug 33955: When copying an image only copy the image contents to the clipboard - - - - - aa8a70d2 by cypherpunks1 at 2023-10-17T11:45:04+02:00 Bug 41791: Omit the source URL when copying page contents to the clipboard - - - - - 7041d1d7 by Pier Angelo Vendrame at 2023-10-17T11:45:04+02:00 Base Browser strings This commit adds all the strings needed by following Base Browser patches. - - - - - fc2f21a0 by Henry Wilkes at 2023-10-17T11:45:04+02:00 fixup! Base Browser strings Bug 41581: Add strings for changing the visibility of the NoScript toolbar button. - - - - - fa657801 by hackademix at 2023-10-17T11:45:05+02:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - c571fe88 by hackademix at 2023-10-17T11:45:05+02:00 Bug 41434: Letterboxing, improve logging. - - - - - 9d99ad64 by hackademix at 2023-10-17T11:45:05+02:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - c99234ff by hackademix at 2023-10-17T11:45:06+02:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 4efda399 by hackademix at 2023-10-17T11:45:06+02:00 Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping - - - - - 78ca1727 by hackademix at 2023-10-17T11:45:06+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping Bug 41259: Do not interfere with devtools responsive mode sizing. - - - - - 0a6b81bc by hackademix at 2023-10-17T11:45:07+02:00 Bug 41631: Prevent weird initial window dimensions caused by subpixel computations - - - - - cd8b4f32 by Pier Angelo Vendrame at 2023-10-17T11:45:07+02:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 06b281df by p13dz at 2023-10-17T11:45:08+02:00 Bug 40283: Workaround for the file upload bug - - - - - 85ca625f by Arthur Edelstein at 2023-10-17T11:45:08+02:00 Bug 18905: Hide unwanted items from help menu Bug 25660: Remove the "New Private Window" option - - - - - 6b3f5364 by cypherpunks1 at 2023-10-17T11:45:08+02:00 Bug 41740: Change the RFP value of devicePixelRatio to 2 - - - - - de619679 by Pier Angelo Vendrame at 2023-10-17T11:45:09+02:00 Bug 41739: Remove "Website appearance" from about:preferences. It is ignored because of RFP and it is confusing for users. - - - - - 1a6f7830 by cypherpunks1 at 2023-10-17T11:45:09+02:00 Bug 41881: Don't persist custom network requests on private windows - - - - - 3a08b4ea by hackademix at 2023-10-17T11:45:09+02:00 Bug 42019: Empty browser's clipboard on browser shutdown - - - - - ca679b4e by hackademix at 2023-10-17T11:45:10+02:00 Bug 42084: Ensure English spoofing works even if preferences are set out of order. - - - - - ee3cf4c1 by Pier Angelo Vendrame at 2023-10-17T11:45:10+02:00 Bug 41603: Customize the creation of MOZ_SOURCE_URL MOZ_SOURCE_URL is created by combining MOZ_SOURCE_REPO and MOZ_SOURCE_CHANGESET. But the code takes for granted that it refers to a Hg instance, so it combines them as `$MOZ_SOURCE_REPO/rev/$MOZ_SOURCE_CHANGESET`. With this commit, we change this logic to combine them to create a URL that is valid for GitLab. $MOZ_SOURCE_CHANGESET needs to be a commit hash, not a branch or a tag. If that is needed, we could use /-/tree/, instead of /-/commit/. - - - - - bcddea4b by Henry Wilkes at 2023-10-17T11:45:10+02:00 Bug 31575: Disable Firefox Home (Activity Stream) Treat about:blank as the default home page and new tab page. Avoid loading AboutNewTab in BrowserGlue.sys.mjs in order to avoid several network requests that we do not need. Bug 41624: Disable about:pocket-* pages. Bug 40144: Redirect about:privatebrowsing to the user's home - - - - - c96ba6a5 by Kathy Brade at 2023-10-17T11:45:11+02:00 Bug 4234: Use the Firefox Update Process for Base Browser. 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 27221: purge the startup cache if the Base Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Base 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 Base 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. - - - - - 047a3b41 by Pier Angelo Vendrame at 2023-10-17T11:45:11+02:00 Bug 42061: Create an alpha update channel. - - - - - cc242472 by Nicolas Vigier at 2023-10-17T11:45:11+02:00 Bug 41682: Add base-browser nightly mar signing key - - - - - e2f12cae by hackademix at 2023-10-17T11:45:12+02:00 Bug 41695: Warn on window maximization without letterboxing in RFPHelper module - - - - - ef1ff9a9 by Pier Angelo Vendrame at 2023-10-17T11:45:12+02:00 Bug 41698: Reword the recommendation badges in about:addons Firefox strings use { -brand-product-name }. As a result, it seems that the fork is recommending extensions, whereas AMO curators are doing that. So, we replace the strings with custom ones that clarify that Mozilla is recommending them. We assign the strings with JS because our translation backend does not support Fluent attributes, yet, but once it does, we should switch to them, instead. Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1825033 - - - - - 35b61f3e by Alex Catarineu at 2023-10-17T11:45:12+02:00 Bug 40069: Add helpers for message passing with extensions - - - - - 775f63a0 by Matthew Finkel at 2023-10-17T11:45:13+02:00 Bug 41598: Prevent NoScript from being removed/disabled. Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 2484e80e by Henry Wilkes at 2023-10-17T11:45:13+02:00 fixup! Bug 41598: Prevent NoScript from being removed/disabled. Bug 41736: Add a isNoScript property to Extension class. - - - - - d5ad86b1 by Henry Wilkes at 2023-10-17T11:46:30+02:00 Bug 41736: Hide NoScript extension's toolbar button by default. This hides it from both the toolbar and the unified extensions panel. We also hide the unified-extension-button if the panel would be empty: not including the NoScript button when it is hidden. As a result, this will be hidden by default until a user installs another extension (or shows the NoScript button and unpins it). - - - - - b3671221 by hackademix at 2023-10-17T11:46:31+02:00 Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons - - - - - f14c0f21 by Pier Angelo Vendrame at 2023-10-17T11:46:32+02:00 Bug 40925: Implemented the Security Level component 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. Bug 40125: Expose Security Level pref in GeckoView - - - - - 80100b80 by Henry Wilkes at 2023-10-17T11:46:32+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 41973: re-align popup panel to the anchor's corner edge. - - - - - bd30dffe by Pier Angelo Vendrame at 2023-10-17T11:46:32+02:00 Bug 40926: Implemented the New Identity feature - - - - - 64925e7c by hackademix at 2023-10-17T11:46:33+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 41765: Force about:privatebrowsing in new identity window. - - - - - e33ff56e by Henry Wilkes at 2023-10-17T11:46:33+02:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42166: Give new identity dialog an accessible name. - - - - - 27b3a865 by Henry Wilkes at 2023-10-17T11:46:33+02:00 Bug 41736: Customize toolbar for base-browser. - - - - - de3c68fe by Henry Wilkes at 2023-10-17T11:46:34+02:00 fixup! Bug 41736: Customize toolbar for base-browser. Bug 41736: Stop placing the NoScript button in the palette, and let it go to the toolbar by default when shown. - - - - - 92be3c0e by Henry Wilkes at 2023-10-17T11:46:34+02:00 fixup! Bug 41736: Customize toolbar for base-browser. Bug 41581: Keep NoScript button in the toolbar (but hidden) by default. Also includes some migration. - - - - - b3beae2d by Pier Angelo Vendrame at 2023-10-17T11:46:35+02:00 Bug 42027: Base Browser migration procedures. This commit implmenents the the Base Browser's version of _migrateUI. - - - - - 08243f56 by Richard Pospesel at 2023-10-17T11:46:35+02:00 Bug 41649: Create rebase and security backport gitlab issue templates - - - - - b035a588 by Richard Pospesel at 2023-10-17T11:46:35+02:00 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - 87c671f5 by Henry Wilkes at 2023-10-17T11:46:36+02:00 Bug 41803: Add some developer tools for working on tor-browser. - - - - - eb7e38c0 by Kathy Brade at 2023-10-17T11:46:36+02:00 Bug 11641: Disable remoting by default. 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. - - - - - 85aba3be by Alex Catarineu at 2023-10-17T11:46:36+02:00 Add TorStrings module for localization - - - - - c5f069ae by Henry Wilkes at 2023-10-17T11:46:37+02:00 Tor Browser strings This commit adds all the strings needed for Tor Browser patches. - - - - - 04a15c84 by Henry Wilkes at 2023-10-17T11:46:37+02:00 Tor Browser localization migration scripts. - - - - - b1b8cd54 by Mike Perry at 2023-10-17T11:46:37+02:00 Bug 2176: Rebrand Firefox to TorBrowser See also Bugs #5194, #7187, #8115, #8219. This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. Also fix bug 27905. Bug 25702: Update Tor Browser icon to follow design guidelines - Updated all of the branding in /browser/branding/official with new 'stable' icon series. - Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory - Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654) - Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory - Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico) - Added default256.png and default512.png icons - Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon - Use the Tor Browser icon within devtools/client/themes/images/. Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. Bug 28196: preparations for using torbutton tor-browser-brand.ftl A small change to Fluent FileSource class is required so that we can register a new source without its supported locales being counted as available locales for the browser. Bug 31803: Replaced about:debugging logo with flat version 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. Bug 32092: Fix Tor Browser Support link in preferences For bug 40562, we moved onionPattern* from bug 27476 to here, as about:tor needs these files but it is included earlier. Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one Bug 42088: New application icons (used in-app and on linux). Bug 42087: New application icons (windows). - - - - - 74c6185b by sanketh at 2023-10-17T11:46:38+02:00 Bug 40209: Implement Basic Crypto Safety Adds a CryptoSafety actor which detects when you've copied a crypto address from a HTTP webpage and shows a warning. Closes #40209. Bug 40428: Fix string attribute names - - - - - 2bd2f08b by Mike Perry at 2023-10-17T11:46:38+02:00 TB3: Tor Browser's official .mozconfigs. Also: Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option 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. Add --enable-tor-browser-update build option Bug 40793: moved Tor configuration options from old-configure.in to moz.configure Bug 41584: Move some configuration options to base-browser level - - - - - 45252975 by Henry Wilkes at 2023-10-17T11:46:38+02:00 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - 32273632 by Pier Angelo Vendrame at 2023-10-17T11:46:39+02:00 Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Before reordering patches, we used to keep the Tor-related patches (torbutton and tor-launcher) at the beginning. After that issue, we decided to move them towards the end. In addition to that, we have decided to move Tor Browser-only preferences there, too, to make Base Browser-only fixups easier to apply. - - - - - f76b0e07 by Pier Angelo Vendrame at 2023-10-17T11:46:39+02:00 Bug 13252: Customize profile management on macOS On macOS we allow both portable mode and system installation. However, in the latter case, we customize Firefox's directories to match the hierarchy we use for the portable mode. Also, display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. - - - - - d1bdafd9 by Pier Angelo Vendrame at 2023-10-17T11:46:39+02:00 Bug 40933: Add tor-launcher functionality Bug 41926: Reimplement the control port - - - - - f8a57dd1 by Pier Angelo Vendrame at 2023-10-17T11:46:40+02:00 fixup! Bug 40933: Add tor-launcher functionality Bug 42160: Allow specifying a TOR_PROVIDER=none to configure only the proxy settings during the TorProviderBuilder initialization. - - - - - c57b2133 by Richard Pospesel at 2023-10-17T11:46:40+02:00 Bug 40597: Implement TorSettings module - migrated in-page settings read/write implementation from about:preferences#tor to the TorSettings module - TorSettings initially loads settings from the tor daemon, and saves them to firefox prefs - TorSettings notifies observers when a setting has changed; currently only QuickStart notification is implemented for parity with previous preference notify logic in about:torconnect and about:preferences#tor - about:preferences#tor, and about:torconnect now read and write settings thorugh the TorSettings module - all tor settings live in the torbrowser.settings.* preference branch - removed unused pref modify permission for about:torconnect content page from AsyncPrefs.jsm Bug 40645: Migrate Moat APIs to Moat.jsm module - - - - - 78e49358 by Arthur Edelstein at 2023-10-17T11:46:40+02:00 Bug 3455: Add DomainIsolator, for isolating circuit by domain. Add an XPCOM component that registers a ProtocolProxyChannelFilter which sets the username/password for each web request according to url bar domain. Bug 9442: Add New Circuit button Bug 13766: Set a 10 minute circuit dirty timeout for the catch-all circ. Bug 19206: Include a 128 bit random tag as part of the domain isolator nonce. Bug 19206: Clear out the domain isolator state on `New Identity`. Bug 21201.2: Isolate by firstPartyDomain from OriginAttributes Bug 21745: Fix handling of catch-all circuit Bug 41741: Refactor the domain isolator and new circuit - - - - - a9d96306 by Henry Wilkes at 2023-10-17T11:46:41+02:00 Bug 41600: Add a tor circuit display panel. - - - - - a4d912cf by Henry Wilkes at 2023-10-17T11:46:41+02:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 41973: re-align popup panel to the anchor's corner edge. - - - - - 9ca996f6 by hackademix at 2023-10-17T11:46:41+02:00 Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop Bug 41613: Skip Drang & Drop filtering for DNS-safe URLs - - - - - 6628cb16 by Amogh Pradeep at 2023-10-17T11:46:42+02:00 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 - - - - - 07f40bf9 by Matthew Finkel at 2023-10-17T11:46:42+02:00 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. - - - - - a0cb379f by Kathy Brade at 2023-10-17T11:46:42+02:00 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. - - - - - cf2ba22e by Pier Angelo Vendrame at 2023-10-17T11:46:43+02:00 Bug 40807: Added QRCode.js to toolkit/modules - - - - - a9f557f3 by Richard Pospesel at 2023-10-17T11:46:43+02:00 Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection This patch adds a new about:preferences#connection 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 Bug 40774: Update about:preferences page to match new UI designs - - - - - ad1c4d02 by Pier Angelo Vendrame at 2023-10-17T11:46:43+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42155: Drop the unused code for the old bridge removal warning - - - - - e31ce9f7 by Pier Angelo Vendrame at 2023-10-17T11:46:44+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41974: Update the rule for de-emphasized text in bridge addresses - - - - - f6b8e4fa by Pier Angelo Vendrame at 2023-10-17T11:46:44+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41912: Hide "Use Current Bridges" when we do not have any bridge strings. - - - - - 7abf5a2c by Pier Angelo Vendrame at 2023-10-17T11:46:44+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41976: Fix the padding of the collapsed bridge cards. - - - - - 2594a542 by Richard Pospesel at 2023-10-17T11:46:45+02:00 Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor Bug 40773: Update the about:torconnect frontend page to match additional UI flows. Bug 41608: Add a toolbar status button and a urlbar "Connect" button. - - - - - 5b5bf6b2 by hackademix at 2023-10-17T11:46:45+02:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41766: Sanitize about:torconnect redirects. - - - - - 5f09649b by Henry Wilkes at 2023-10-17T11:46:45+02:00 Bug 7494: Create local home page for TBB. Bug 41333: Update about:tor to new design. Including: + make the favicon match the branding icon. + make the location bar show a search icon. - - - - - 057dce90 by Arthur Edelstein at 2023-10-17T11:46:46+02:00 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. - - - - - 1febd7e6 by Pier Angelo Vendrame at 2023-10-17T11:46:48+02:00 Bug 41668: Tweaks to the Base Browser updater for Tor Browser This commit was once part of "Bug 4234: Use the Firefox Update Process for Tor Browser.". However, some parts of it were not needed for Base Browser and some derivative browsers. Therefore, we extracted from that commit the parts for Tor Browser legacy, and we add them back to the patch set with this commit. - - - - - e8606d95 by Kathy Brade at 2023-10-17T11:46:49+02:00 Bug 12647: Support symlinks in the updater. - - - - - 02d53800 by Kathy Brade at 2023-10-17T11:46:49+02:00 Bug 19121: reinstate the update.xml hash check This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert most 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)." We kept the addition to the AppConstants API in case other JS code references it in the future. - - - - - 6c24cc72 by Kathy Brade at 2023-10-17T11:46:49+02:00 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. - - - - - 68b68661 by Georg Koppen at 2023-10-17T11:46:50+02:00 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 - - - - - 671877e1 by Mike Perry at 2023-10-17T11:46:50+02:00 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. squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40494: Update Startpage search provider squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40438: Add Blockchair as a search engine 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. - - - - - 81eb5071 by Alex Catarineu at 2023-10-17T11:46:50+02:00 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. - - - - - 8b15dd84 by Henry Wilkes at 2023-10-17T11:46:51+02:00 Bug 41906: Hide DNS over HTTPS preferences. - - - - - 53008b50 by Richard Pospesel at 2023-10-17T11:46:51+02:00 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. - - - - - a8e12d13 by Kathy Brade at 2023-10-17T11:46:51+02:00 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. - - - - - 80ef7fc1 by Alex Catarineu at 2023-10-17T11:46:52+02:00 Bug 21952: Implement Onion-Location Whenever a valid Onion-Location HTTP header (or corresponding HTML <meta> 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. - - - - - 7d8c054d by Pier Angelo Vendrame at 2023-10-17T11:46:52+02:00 Bug 40458: Implement .tor.onion aliases We have enabled HTTPS-Only mode, therefore we do not need HTTPS-Everywhere anymore. However, we want to keep supporting .tor.onion aliases (especially for securedrop). Therefore, in this patch we implemented the parsing of HTTPS-Everywhere rulesets, and the redirect of .tor.onion domains. Actually, Tor Browser believes they are actual domains. We change them on the fly on the SOCKS proxy requests to resolve the domain, and on the code that verifies HTTPS certificates. - - - - - 5f8029ff by Pier Angelo Vendrame at 2023-10-17T11:46:52+02:00 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. - - - - - 99cf3ff8 by Pier Angelo Vendrame at 2023-10-17T11:46:53+02:00 Bug 41435: Add a Tor Browser migration function For now this function only deletes old language packs for which we are already packaging the strings with the application. - - - - - 77a722dc by Henry Wilkes at 2023-10-17T11:46:53+02:00 Bug 42110: Add TorUIUtils module for common tor component methods. - - - - - a6a22760 by Dan Ballard at 2023-10-17T11:46:53+02:00 Bug 40701: Add security warning when downloading a file Shown in the downloads panel, about:downloads and places.xhtml. - - - - - 651df4dd by Henry Wilkes at 2023-10-17T11:46:54+02:00 Bug 41736: Customize toolbar for tor-browser. - - - - - e24e0656 by hackademix at 2023-10-17T11:46:54+02:00 Bug 41728: Pin bridges.torproject.org domains to Let's Encrypt's root cert public key - - - - - accd2038 by Henry Wilkes at 2023-10-17T11:46:54+02:00 Customize moz-toggle for tor-browser. - - - - - 58382e90 by Richard Pospesel at 2023-10-17T11:46:55+02:00 Bug 41822: Unconditionally disable default browser UX in about:preferences - - - - - e1b11657 by Henry Wilkes at 2023-10-17T11:46:55+02:00 Bug 42072: 2023 year end campaign for about:tor. - - - - - 30 changed files: - .eslintignore - .gitignore - + .gitlab/issue_templates/Backport Android Security Fixes.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - + .gitlab/issue_templates/bug.md - + .gitlab/merge_request_templates/default.md - accessible/android/SessionAccessibility.cpp - accessible/android/SessionAccessibility.h - accessible/ipc/DocAccessibleParent.cpp - accessible/ipc/DocAccessibleParent.h - accessible/ipc/moz.build - + browser/actors/AboutTBUpdateChild.jsm - + browser/actors/AboutTBUpdateParent.jsm - + browser/actors/CryptoSafetyChild.jsm - + browser/actors/CryptoSafetyParent.jsm - − browser/actors/RFPHelperChild.sys.mjs - − browser/actors/RFPHelperParent.sys.mjs - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/moz.build - browser/app/permissions - + browser/app/profile/000-tor-browser.js - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/20523f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/20523f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.4.0esr-13.5-1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new branch tor-browser-115.4.0esr-13.5-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.4.0esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new branch tor-browser-115.4.0esr-13.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_115_4_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 17 Oct '23

17 Oct '23

Pier Angelo Vendrame pushed new tag FIREFOX_115_4_0esr_BUILD1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] Bug 40976: Update download-unsigned-sha256sums-gpg-signatures-from-people-tpo...
by richard (＠richard) 16 Oct '23

16 Oct '23

richard pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: 4d93e941 by Nicolas Vigier at 2023-10-16T18:27:18+00:00 Bug 40976: Update download-unsigned-sha256sums-gpg-signatures-from-people-tpo to fetch from tb-build-02 and tb-build-03 - - - - - 1 changed file: - tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo Changes: ===================================== tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo ===================================== @@ -16,6 +16,8 @@ do file="$file.asc" urls=( \ "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ + "https://tb-build-02.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ + "https://tb-build-03.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40976: Update download-unsigned-sha256sums-gpg-signatures-from-people-tpo...
by richard (＠richard) 16 Oct '23

16 Oct '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 5380e131 by Nicolas Vigier at 2023-10-16T18:24:26+00:00 Bug 40976: Update download-unsigned-sha256sums-gpg-signatures-from-people-tpo to fetch from tb-build-02 and tb-build-03 - - - - - 1 changed file: - tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo Changes: ===================================== tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo ===================================== @@ -16,6 +16,8 @@ do file="$file.asc" urls=( \ "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_ve…" \ + "https://tb-build-02.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ + "https://tb-build-03.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ "https://tb-build-04.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ "https://tb-build-05.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$t…" \ ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] Bug 40979: Add redirects from old linux filenames in .htaccess
by richard (＠richard) 14 Oct '23

14 Oct '23

richard pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: e0f0ec91 by Nicolas Vigier at 2023-10-14T05:53:12+00:00 Bug 40979: Add redirects from old linux filenames in .htaccess Add some redirects, to make old filenames work for torbrowser-launcher. - - - - - 1 changed file: - projects/release/build Changes: ===================================== projects/release/build ===================================== @@ -42,12 +42,18 @@ mkdir -p "$destdir" "$destdir"/ [% END -%] cd "$destdir" -cat > .htaccess <<EOF +cat > .htaccess <<'EOF' RewriteEngine On RewriteRule ^sha256sums.txt$ sha256sums-unsigned-build.txt RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc +[% IF c("var/tor-browser") -%] +RewriteRule ^tor-browser-linux64-(.*)_ALL.tar.xz.asc$ tor-browser-linux-x86_64-$1.tar.xz.asc +RewriteRule ^tor-browser-linux64-(.*)_ALL.tar.xz$ tor-browser-linux-x86_64-$1.tar.xz +RewriteRule ^tor-browser-linux32-(.*)_ALL.tar.xz.asc$ tor-browser-linux-i686-$1.tar.xz.asc +RewriteRule ^tor-browser-linux32-(.*)_ALL.tar.xz$ tor-browser-linux-i686-$1.tar.xz +[% END -%] EOF # empty any existing sh256sums file View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40979: Add redirects from old linux filenames in .htaccess
by richard (＠richard) 14 Oct '23

14 Oct '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 7eab1212 by Nicolas Vigier at 2023-10-14T07:43:32+02:00 Bug 40979: Add redirects from old linux filenames in .htaccess Add some redirects, to make old filenames work for torbrowser-launcher. - - - - - 1 changed file: - projects/release/build Changes: ===================================== projects/release/build ===================================== @@ -42,12 +42,18 @@ mkdir -p "$destdir" "$destdir"/ [% END -%] cd "$destdir" -cat > .htaccess <<EOF +cat > .htaccess <<'EOF' RewriteEngine On RewriteRule ^sha256sums.txt$ sha256sums-unsigned-build.txt RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc +[% IF c("var/tor-browser") -%] +RewriteRule ^tor-browser-linux64-(.*)_ALL.tar.xz.asc$ tor-browser-linux-x86_64-$1.tar.xz.asc +RewriteRule ^tor-browser-linux64-(.*)_ALL.tar.xz$ tor-browser-linux-x86_64-$1.tar.xz +RewriteRule ^tor-browser-linux32-(.*)_ALL.tar.xz.asc$ tor-browser-linux-i686-$1.tar.xz.asc +RewriteRule ^tor-browser-linux32-(.*)_ALL.tar.xz$ tor-browser-linux-i686-$1.tar.xz +[% END -%] EOF # empty any existing sh256sums file View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Deleted branch asciiwolf-git-url-fix
by asciiwolf (＠asciiwolf) 13 Oct '23

13 Oct '23

asciiwolf deleted branch asciiwolf-git-url-fix at The Tor Project / Applications / torbrowser-launcher -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][main] 2 commits: Update Git repo URL in BUILD.md
by richard (＠richard) 13 Oct '23

13 Oct '23

richard pushed to branch main at The Tor Project / Applications / torbrowser-launcher Commits: 8f4d4c84 by asciiwolf at 2023-10-13T12:22:19+00:00 Update Git repo URL in BUILD.md - - - - - 40e7cacb by richard at 2023-10-13T21:00:04+00:00 Merge branch 'asciiwolf-git-url-fix' into 'main' Update Git repo URL in BUILD.md See merge request tpo/applications/torbrowser-launcher!2 - - - - - 1 changed file: - BUILD.md Changes: ===================================== BUILD.md ===================================== @@ -3,7 +3,7 @@ First, clone the repository: ```sh -git clone https://github.com/micahflee/torbrowser-launcher.git +git clone https://gitlab.torproject.org/tpo/applications/torbrowser-launcher.git cd torbrowser-launcher ``` View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Deleted branch asciiwolf-appstream-urls-fix
by asciiwolf (＠asciiwolf) 13 Oct '23

13 Oct '23

asciiwolf deleted branch asciiwolf-appstream-urls-fix at The Tor Project / Applications / torbrowser-launcher -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][main] 2 commits: Update URLs in AppStream metadata
by richard (＠richard) 13 Oct '23

13 Oct '23

richard pushed to branch main at The Tor Project / Applications / torbrowser-launcher Commits: 07c2f671 by asciiwolf at 2023-10-13T12:16:08+00:00 Update URLs in AppStream metadata - - - - - a35c1598 by richard at 2023-10-13T18:23:49+00:00 Merge branch 'asciiwolf-appstream-urls-fix' into 'main' Update URLs in AppStream metadata See merge request tpo/applications/torbrowser-launcher!1 - - - - - 1 changed file: - share/metainfo/torbrowser.appdata.xml Changes: ===================================== share/metainfo/torbrowser.appdata.xml ===================================== @@ -21,11 +21,11 @@ </description> <screenshots> <screenshot type="default"> - <image>https://raw.githubusercontent.com/micahflee/torbrowser-launcher/master/scre…</image> + <image>https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/raw/ma…</image> <caption>Window to change Tor Browser Launcher settings</caption> </screenshot> </screenshots> - <url type="homepage">https://github.com/micahflee/torbrowser-launcher</url> + <url type="homepage">https://gitlab.torproject.org/tpo/applications/torbrowser-launcher</url> <update_contact>micah(a)micahflee.com</update_contact> <content_rating type="oars-1.1"/> <releases> View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Deleted branch asciiwolf-tbb-archive-name-fix
by asciiwolf (＠asciiwolf) 13 Oct '23

13 Oct '23

asciiwolf deleted branch asciiwolf-tbb-archive-name-fix at The Tor Project / Applications / torbrowser-launcher -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher][main] 2 commits: Fix TBB archive name format
by richard (＠richard) 13 Oct '23

13 Oct '23

richard pushed to branch main at The Tor Project / Applications / torbrowser-launcher Commits: 1a0562ba by asciiwolf at 2023-10-13T15:04:09+00:00 Fix TBB archive name format - - - - - 8276534d by richard at 2023-10-13T18:23:08+00:00 Merge branch 'asciiwolf-tbb-archive-name-fix' into 'main' Fix TBB archive name format Closes #4 See merge request tpo/applications/torbrowser-launcher!3 - - - - - 1 changed file: - torbrowser_launcher/common.py Changes: ===================================== torbrowser_launcher/common.py ===================================== @@ -104,11 +104,11 @@ class Common(object): if tbb_version: # tarball filename if self.architecture == "x86_64": - arch = "linux64" + arch = "linux-x86_64" else: - arch = "linux32" + arch = "linux-i686" - tarball_filename = "tor-browser-" + arch + "-" + tbb_version + "_ALL.tar.xz" + tarball_filename = "tor-browser-" + arch + "-" + tbb_version + ".tar.xz" # tarball self.paths["tarball_url"] = ( View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/compar… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Pushed new branch asciiwolf-tbb-archive-name-fix
by asciiwolf (＠asciiwolf) 13 Oct '23

13 Oct '23

asciiwolf pushed new branch asciiwolf-tbb-archive-name-fix at The Tor Project / Applications / torbrowser-launcher -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/tree/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Deleted branch asciiwolf-tbb-archive-name-fix
by asciiwolf (＠asciiwolf) 13 Oct '23

13 Oct '23

asciiwolf deleted branch asciiwolf-tbb-archive-name-fix at The Tor Project / Applications / torbrowser-launcher -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Pushed new branch asciiwolf-tbb-archive-name-fix
by asciiwolf (＠asciiwolf) 13 Oct '23

13 Oct '23

asciiwolf pushed new branch asciiwolf-tbb-archive-name-fix at The Tor Project / Applications / torbrowser-launcher -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/tree/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Pushed new branch asciiwolf-git-url-fix
by asciiwolf (＠asciiwolf) 13 Oct '23

13 Oct '23

asciiwolf pushed new branch asciiwolf-git-url-fix at The Tor Project / Applications / torbrowser-launcher -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/tree/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbrowser-launcher] Pushed new branch asciiwolf-appstream-urls-fix
by asciiwolf (＠asciiwolf) 13 Oct '23

13 Oct '23

asciiwolf pushed new branch asciiwolf-appstream-urls-fix at The Tor Project / Applications / torbrowser-launcher -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/tree/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] 2 commits: Update rbm for rbm#40062
by boklm (＠boklm) 13 Oct '23

13 Oct '23

boklm pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: 1fc15e38 by Nicolas Vigier at 2023-10-13T07:13:11+02:00 Update rbm for rbm#40062 - - - - - d20f3409 by Nicolas Vigier at 2023-10-13T07:13:28+02:00 Bug 40975: Don't include libstdc++ twice in Tor Browser - - - - - 2 changed files: - projects/firefox/build - rbm Changes: ===================================== projects/firefox/build ===================================== @@ -312,7 +312,7 @@ END; [% IF c("var/linux") -%] /var/tmp/dist/gcc/bin/g++ $rootdir/abicheck.cc -o Browser/abicheck -std=c++17 - [% IF !c("var/torbrowser") -%] + [% IF !c("var/tor-browser") -%] libdest=Browser/libstdc++ mkdir -p "$libdest" # FIXME: tor-browser-build#40749 ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit fb51b232ea9281032762df30211400139ff80275 +Subproject commit 0a47c75f7b9b3c6ccc4086b44336be0b85e5fbef View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-update-responses][main] release: new version, 13.0
by richard (＠richard) 12 Oct '23

12 Oct '23

richard pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: ba0c24e1 by Richard Pospesel at 2023-10-12T18:35:17+00:00 release: new version, 13.0 - - - - - 30 changed files: - update_3/release/.htaccess - − update_3/release/12.5.3-12.5.6-linux32-ALL.xml - − update_3/release/12.5.3-12.5.6-linux64-ALL.xml - − update_3/release/12.5.3-12.5.6-macos-ALL.xml - − update_3/release/12.5.3-12.5.6-win32-ALL.xml - − update_3/release/12.5.3-12.5.6-win64-ALL.xml - − update_3/release/12.5.4-12.5.6-linux32-ALL.xml - − update_3/release/12.5.4-12.5.6-linux64-ALL.xml - − update_3/release/12.5.4-12.5.6-macos-ALL.xml - − update_3/release/12.5.4-12.5.6-win32-ALL.xml - − update_3/release/12.5.4-12.5.6-win64-ALL.xml - + update_3/release/12.5.4-13.0-linux-i686-ALL.xml - + update_3/release/12.5.4-13.0-linux-x86_64-ALL.xml - + update_3/release/12.5.4-13.0-macos-ALL.xml - + update_3/release/12.5.4-13.0-windows-i686-ALL.xml - + update_3/release/12.5.4-13.0-windows-x86_64-ALL.xml - − update_3/release/12.5.5-12.5.6-linux32-ALL.xml - − update_3/release/12.5.5-12.5.6-linux64-ALL.xml - − update_3/release/12.5.5-12.5.6-macos-ALL.xml - − update_3/release/12.5.5-12.5.6-win32-ALL.xml - − update_3/release/12.5.5-12.5.6-win64-ALL.xml - + update_3/release/12.5.5-13.0-linux-i686-ALL.xml - + update_3/release/12.5.5-13.0-linux-x86_64-ALL.xml - + update_3/release/12.5.5-13.0-macos-ALL.xml - + update_3/release/12.5.5-13.0-windows-i686-ALL.xml - + update_3/release/12.5.5-13.0-windows-x86_64-ALL.xml - + update_3/release/12.5.6-13.0-linux-i686-ALL.xml - + update_3/release/12.5.6-13.0-linux-x86_64-ALL.xml - + update_3/release/12.5.6-13.0-macos-ALL.xml - + update_3/release/12.5.6-13.0-windows-i686-ALL.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-13.0-build1
by Pier Angelo Vendrame (＠pierov) 12 Oct '23

12 Oct '23

Pier Angelo Vendrame pushed new tag mb-13.0-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.0-build1
by Pier Angelo Vendrame (＠pierov) 12 Oct '23

12 Oct '23

Pier Angelo Vendrame pushed new tag tbb-13.0-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] Bug 40965&40966: Tor Browser and Mullvad Browser 13.0.
by Pier Angelo Vendrame (＠pierov) 12 Oct '23

12 Oct '23

Pier Angelo Vendrame pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: 02ae8095 by Pier Angelo Vendrame at 2023-10-12T08:38:47+02:00 Bug 40965&40966: Tor Browser and Mullvad Browser 13.0. - - - - - 10 changed files: - projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/browser/allowed_addons.json - projects/browser/config - projects/firefox-android/config - projects/firefox/config - projects/geckoview/config - projects/manual/config - projects/translation/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-MB/ChangeLog.txt ===================================== @@ -1,3 +1,170 @@ +Mullvad Browser 13.0 - October 12 2023 + * All Platforms + * Updated Firefox to 115.3.1esr + * Bug 40050: FF103 Audit [tor-browser-spec] + * Bug 40051: FF104 Audit [tor-browser-spec] + * Bug 40052: FF105 Audit [tor-browser-spec] + * Bug 40053: FF106 Audit [tor-browser-spec] + * Bug 40054: FF107 Audit [tor-browser-spec] + * Bug 40055: FF108 Audit [tor-browser-spec] + * Bug 40056: FF109 Audit [tor-browser-spec] + * Bug 40057: FF110 Audit [tor-browser-spec] + * Bug 40058: FF111 Audit [tor-browser-spec] + * Bug 40059: FF112 Audit [tor-browser-spec] + * Bug 40060: FF113 Audit [tor-browser-spec] + * Bug 40061: FF114 Audit [tor-browser-spec] + * Bug 40062: FF115 Audit [tor-browser-spec] + * Bug 66: Localize Mullvad Browser [mullvad-browser] + * Bug 166: Enable built-in URL anti-tracking query parameters stripping [mullvad-browser] + * Bug 175: Change the default start window size from 1000x1000 [mullvad-browser] + * Bug 177: Change help links in `about:preferences` and menu [mullvad-browser] + * Bug 183: Rebase Mullvad Browser to Firefox 115 [mullvad-browser] + * Bug 195: Choose which locales to translate Mullvad Browser to [mullvad-browser] + * Bug 196: Enumerate Mullvad Browser-specific strings for localization [mullvad-browser] + * Bug 199: Mullvad Browser changes required to use Mullvad Browser-specific localization strings [mullvad-browser] + * Bug 208: Improve letterboxing's dimensions [mullvad-browser] + * Bug 211: Change "Mullvad Browser Home" to "New tab" [mullvad-browser] + * Bug 213: Add search engines to the default list [mullvad-browser] + * Bug 214: Enable cross-tab identity leak protection in "quiet" mode [mullvad-browser] + * Bug 215: Update re-adds manually removed default toolbar buttons [mullvad-browser] + * Bug 218: uBO and Mullvad Browser Extension hidden in unified extensions panel [mullvad-browser] + * Bug 220: "Firefox Suggest" string appears when search matches a bookmark [mullvad-browser] + * Bug 223: Trademarks in the about popup are not translated [mullvad-browser] + * Bug 226: First window after update should go to the user-friendly release page on GitHub [mullvad-browser] + * Bug 228: Remove popup asking for preferred language on websites [mullvad-browser] + * Bug 231: Fix the Security Level "read more" link in popup/settings panel [mullvad-browser] + * Bug 243: Make sure about:mullvadbrowser is treated as a new tab page [mullvad-browser] + * Bug 26277: When "Safest" setting is enabled searching using duckduckgo should always use the Non-Javascript site for searches [tor-browser] + * Bug 30556: Re-evaluate letterboxing dimension choices [tor-browser] + * Bug 33282: Increase the max width of new windows [tor-browser] + * Bug 33955: Selecting "Copy image" from menu leaks the source URL to the clipboard. This data is often dereferenced by other applications. [tor-browser] + * Bug 41327: Disable UrlbarProviderInterventions [tor-browser] + * Bug 41477: Review some extensions.* preferences [tor-browser] + * Bug 41496: Review 000-tor-browser.js and 001-base-profile.js for 115 [tor-browser] + * Bug 41528: Hard-coded English "based on Mozilla Firefox" appears in version in "About" dialog [tor-browser] + * Bug 41576: ESR115: ensure no remote calls for weather & addon suggestions [tor-browser] + * Bug 41581: ESR115: figure out extension pinning / unified Extensions [tor-browser] + * Bug 41642: Do not hide new PBM in the hamburger menu if auto PBM is not enabled [tor-browser] + * Bug 41675: Remove javascript.options.large_arraybuffers [tor-browser] + * Bug 41691: "Firefox Suggest" text appearing in UI [tor-browser] + * Bug 41727: WebRTC privacy-hardening settings [tor-browser] + * Bug 41739: Remove "Website appearance" [tor-browser] + * Bug 41740: ESR115: change devicePixelRatio spoof to 2 in alpha for testing [tor-browser] + * Bug 41752: Review changes done by Bug 41565 [tor-browser] + * Bug 41765: TTP-02-006 WP1: Information leaks via custom homepage (Low) [tor-browser] + * Bug 41774: Hide the new "Switching to a new device" help menu item [tor-browser] + * Bug 41791: Copying page contents also puts the source URL on the clipboard [tor-browser] + * Bug 41797: Lock RFP in release builds [tor-browser] + * Bug 41833: Reload extensions on new identity [tor-browser] + * Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons [tor-browser] + * Bug 41874: Visual & A11 regressions in add-on badges [tor-browser] + * Bug 41876: Remove Firefox View from title bar [tor-browser] + * Bug 41877: NoScript seems to be blocking by default in the first 115-based testbuild [tor-browser] + * Bug 41881: Developer tools/Network/New Request remembers requests [tor-browser] + * Bug 41903: The info icon on the language change prompt is not shown [tor-browser] + * Bug 41936: Review Mozilla 1770158: Use double-conversion library instead of dtoa for string-to-double conversion [tor-browser] + * Bug 41937: Review Mozilla 1780014: Add specific telemetry for conservative and first-try handshakes [tor-browser] + * Bug 41938: Review Mozilla 1769994: On systems with IPv6 preferred DNS resolution clients will fail to connect when "localhost" is used as host for the WebSocket server [tor-browser] + * Bug 41939: Review Mozilla 1728871: Support fetching data from Remote Setting [tor-browser] + * Bug 41940: Review Mozilla 1739348: When a filetype is set to "always ask" and the user makes a save/open choice in the dialog, we should not also open the downloads panel [tor-browser] + * Bug 41941: Review Mozilla 1775254: Improve Math.pow accuracy for large exponents [tor-browser] + * Bug 41943: Lock javascript.options.spectre.disable_for_isolated_content to false [tor-browser] + * Bug 41945: Review Mozilla 1783019: Add a cookie banner service to automatically handle website cookie banners [tor-browser] + * Bug 41946: Review Mozilla 1782579: Add a locale parameter to the text recognition API [tor-browser] + * Bug 41947: Review Mozilla 1779005: Broken since Firefox 102.0: no instant fallback to direct connection when proxy became unreachable while runtime [tor-browser] + * Bug 41949: Review Mozilla 1782578: Implement a context menu modal for text recognition [tor-browser] + * Bug 41950: Review Mozilla 1788668: Add the possibility to check that the clipboard contains some pdfjs stuff [tor-browser] + * Bug 41951: Review Mozilla 1790681: Enable separatePrivateDefault by default [tor-browser] + * Bug 41959: Review Mozilla 1795944: Remove descriptionheightworkaround [tor-browser] + * Bug 41961: Review Mozilla 1798868: Hide cookie banner handling UI by default [tor-browser] + * Bug 41969: Review Mozilla 1746983: Re-enable pingsender2 [tor-browser] + * Bug 41970: Review Mozilla 17909270: WebRTC bypasses Network settings & proxy.onRequest [tor-browser] + * Bug 41973: Custom wingpanels don't line up with their toolbar icons in 13.0 alpha [tor-browser] + * Bug 41981: Review Mozilla 1800675: Add about:preferences entry for cookie banner handling [tor-browser] + * Bug 41983: Review Mozilla 1770447: Create a reusable "support-link" widget [tor-browser] + * Bug 41984: Rename languageNotification.ftl to base-browser.ftl [tor-browser] + * Bug 42013: Review Mozilla 1834374: Do not call EmptyClipboard() in nsBaseClipboard destructor [tor-browser] + * Bug 42014: Review Mozilla 1832791: Implement a Remote Settings for the Quarantined Domains pref [tor-browser] + * Bug 42015: Review Mozilla 1830890: Keep a history window of WebRTC stats for about:webrtc [tor-browser] + * Bug 42019: Empty browser's clipboard on browser shutdown [tor-browser] + * Bug 42022: Prevent extension search engines from breaking the whole search system [tor-browser] + * Bug 42026: Disable cookie banner service and UI. [tor-browser] + * Bug 42027: Create a Base Browser version of migrateUI [tor-browser] + * Bug 42029: Defense-in-depth: disable non-proxied UDP WebRTC [tor-browser] + * Bug 42037: Disable about:firefoxview [tor-browser] + * Bug 42043: Disable gUM: media.devices.enumerate.legacy.enabled [tor-browser] + * Bug 42046: Remove XUL layout hacks from base browser [tor-browser] + * Bug 42050: Bring back Save As... dialog as default [tor-browser] + * Bug 42061: Move the alpha update channel creation to a commit on its own [tor-browser] + * Bug 42083: RemoteSecuritySettings.init throws error in console [tor-browser] + * Bug 42084: Race condition with language preferences may make spoof_english ineffective [tor-browser] + * Bug 42094: Disable `media.aboutwebrtc.hist.enabled` as security in-depth [tor-browser] + * Bug 42138: Disable apz.overscroll.enabled pref [tor-browser] + * Bug 42159: Responsive Design Mode not working correctly [tor-browser] + * Bug 42166: New identity dialog missing accessible name [tor-browser] + * Bug 42167: Make the preference auto-focus more reliable [tor-browser] + * Bug 40893: Update (Noto) fonts for 13.0 [tor-browser-build] + * Bug 40924: Customize MOZ_APP_REMOTINGNAME instead of passing --name and --class [tor-browser-build] + * Bug 40937: First window after update should go to the user-friendly release page on GitHub [tor-browser-build] + * Windows + * Bug 40737: Revert backout of Mozilla's fix for bug 1724777 [tor-browser] + * Bug 41798: Stop building private_browsing.exe on Windows [tor-browser] + * Bug 41806: Prevent Private Browsing start menu item to be added automatically [tor-browser] + * Bug 41942: Review Mozilla 1682520: Use the WER runtime exception module to catch early crashes [tor-browser] + * Bug 41944: Review Mozilla 1774083: Add Surrogate COM Server to handle native Windows notifications when Firefox is closed. [tor-browser] + * Bug 42008: Review Mozilla 1808146: Copying images from Pixiv and pasting them in certain programs is broken [tor-browser] + * Bug 42010: Review Mozilla 1810641: Enable overscroll on Windows on all channels [tor-browser] + * Bug 40930: Upate zlib to 1.3 after 13.0a3 [tor-browser-build] + * macOS + * Bug 41948: Review Mozilla 1782981: Hide the text recognition context menu if the macOS version doesn't support APIs [tor-browser] + * Bug 41982: Review Mozilla 1762392: Add Cocoa platform support for paste files [tor-browser] + * Bug 42057: Disable Platform text-recognition functionality [tor-browser] + * Bug 42147: Add browser.helperApps.deleteTempFileOnExit to our profile [tor-browser] + * Linux + * Bug 225: Right Click -> New Tab on link does nothing [mullvad-browser] + * Bug 41884: Linux: set browser.tabs.searchclipboardfor.middleclick to false [tor-browser] + * Bug 40576: Fontconfig warning: remove 'blank' configuration [tor-browser-build] + * Build System + * All Platforms + * Bug 180: Change the naming scheme of the installers at build time [mullvad-browser] + * Bug 197: Develop Crowdin to Gitlab translations repo pipeline [mullvad-browser] + * Bug 198: Enable localization for Mullvad Browser builds [mullvad-browser] + * Bug 31588: Be smarter about vendoring for Rust projects [tor-browser-build] + * Bug 40089: Clean up usage of get-moz-build-date script [tor-browser-build] + * Bug 40149: Remove patching of nightly update URL [tor-browser-build] + * Bug 40410: Get rid of python2 [tor-browser-build] + * Bug 40487: Bump Python version [tor-browser-build] + * Bug 40615: Consider adding a readme to the fonts directory [tor-browser-build] + * Bug 40802: Drop the patch for making WASI reproducible [tor-browser-build] + * Bug 40829: Review and standardize naming scheme for browser installer/package artifacts [tor-browser-build] + * Bug 40855: Update toolchains for Mozilla 115 [tor-browser-build] + * Bug 40868: Bump Rust to 1.69.0 [tor-browser-build] + * Bug 40880: The README doesn't include some dependencies needed for building incrementals [tor-browser-build] + * Bug 40886: Update README with instructions for Arch linux [tor-browser-build] + * Bug 40898: Add doc from tor-browser-spec/processes/ReleaseProcess to gitlab issue templates [tor-browser-build] + * Bug 40907: Sometimes debug information are not deterministic with Clang 16.0.4 [tor-browser-build] + * Bug 40916: Update updated_responses_config.yml to pull Mullvad incrementals from archive.torproject.org [tor-browser-build] + * Bug 40922: Use base-browser.ftl instead of languageNotification.ftl [tor-browser-build] + * Bug 40931: Fix incrementals after tor-browser-build#40829 [tor-browser-build] + * Bug 40932: Remove appname_bundle_android, appname_bundle_macos, appname_bundle_linux, appname_bundle_win32, appname_bundle_win64 from projects/release/update_responses_config.yml [tor-browser-build] + * Bug 40933: Fix generating incrementals between 12.5.x and 13.0 [tor-browser-build] + * Bug 40935: Fix fallout from build target rename in signing scripts [tor-browser-build] + * Bug 40942: Use the branch to build Base Browser [tor-browser-build] + * Bug 40944: After #40931, updates_responses is using incremental.mar files as if they were non-incremental mar files [tor-browser-build] + * Bug 40946: override_updater_url does not work for Mullvad Browser [tor-browser-build] + * Bug 40947: Remove migrate_langs from tools/signing/nightly/update-responses-base-config.yml [tor-browser-build] + * Bug 40956: Allow testing the updater also with release and alpha channel [tor-browser-build] + * Bug 40957: Expired subkey warning on Tor Browser GPG verification [tor-browser-build] + * Bug 40972: Handle Mullvad Browser in the changelog script and group entries by project [tor-browser-build] + * Windows + * Bug 41995: Generated headers on Windows aren't reproducible [tor-browser] + * Bug 40832: Unify mingw-w64-clang 32+64 bits [tor-browser-build] + * Bug 40940: Change position of the `install|portable` in the builds filenames [tor-browser-build] + * macOS + * Bug 40943: Update libdmg-hfsplus to include our uplifted patch [tor-browser-build] + * Linux + * Bug 40102: Move from Debian Jessie to Debian Stretch for our Linux builds [tor-browser-build] + Mullvadd Browser 13.0a6 - September 29 2023 * All Platforms * Updated uBlock Origin to 1.52.2 ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,295 @@ +Tor Browser 13.0 - October 12 2023 + * All Platforms + * Updated tor to 0.4.8.7 + * Updated OpenSSL to 3.0.11 + * Bug 40050: FF103 Audit [tor-browser-spec] + * Bug 40051: FF104 Audit [tor-browser-spec] + * Bug 40052: FF105 Audit [tor-browser-spec] + * Bug 40053: FF106 Audit [tor-browser-spec] + * Bug 40054: FF107 Audit [tor-browser-spec] + * Bug 40055: FF108 Audit [tor-browser-spec] + * Bug 40056: FF109 Audit [tor-browser-spec] + * Bug 40057: FF110 Audit [tor-browser-spec] + * Bug 40058: FF111 Audit [tor-browser-spec] + * Bug 40059: FF112 Audit [tor-browser-spec] + * Bug 40060: FF113 Audit [tor-browser-spec] + * Bug 40061: FF114 Audit [tor-browser-spec] + * Bug 40062: FF115 Audit [tor-browser-spec] + * Bug 26277: When "Safest" setting is enabled searching using duckduckgo should always use the Non-Javascript site for searches [tor-browser] + * Bug 40577: Add "suggest url" in DDG onion's manifest [tor-browser] + * Bug 40938: Migrate remaining torbutton functionality to tor-browser [tor-browser] + * Bug 41092: Enable tracking query parameters stripping [tor-browser] + * Bug 41327: Disable UrlbarProviderInterventions [tor-browser] + * Bug 41399: Update Mozilla's patch for Bug 1675054 to enable brotli encoding for HTTP onions as well [tor-browser] + * Bug 41477: Review some extensions.* preferences [tor-browser] + * Bug 41496: Review 000-tor-browser.js and 001-base-profile.js for 115 [tor-browser] + * Bug 41576: ESR115: ensure no remote calls for weather & addon suggestions [tor-browser] + * Bug 41605: Remove unused assets from torbutton (preferences-mobile.css) [tor-browser] + * Bug 41675: Remove javascript.options.large_arraybuffers [tor-browser] + * Bug 41727: WebRTC privacy-hardening settings [tor-browser] + * Bug 41740: ESR115: change devicePixelRatio spoof to 2 in alpha for testing [tor-browser] + * Bug 41752: Review changes done by Bug 41565 [tor-browser] + * Bug 41796: Rebase Tor Browser to Firefox 115 [tor-browser] + * Bug 41797: Lock RFP in release builds [tor-browser] + * Bug 41934: Websocket raises DOMException on http onions in 13.0a1 [tor-browser] + * Bug 41936: Review Mozilla 1770158: Use double-conversion library instead of dtoa for string-to-double conversion [tor-browser] + * Bug 41937: Review Mozilla 1780014: Add specific telemetry for conservative and first-try handshakes [tor-browser] + * Bug 41938: Review Mozilla 1769994: On systems with IPv6 preferred DNS resolution clients will fail to connect when "localhost" is used as host for the WebSocket server [tor-browser] + * Bug 41939: Review Mozilla 1728871: Support fetching data from Remote Setting [tor-browser] + * Bug 41941: Review Mozilla 1775254: Improve Math.pow accuracy for large exponents [tor-browser] + * Bug 41943: Lock javascript.options.spectre.disable_for_isolated_content to false [tor-browser] + * Bug 41945: Review Mozilla 1783019: Add a cookie banner service to automatically handle website cookie banners [tor-browser] + * Bug 41946: Review Mozilla 1782579: Add a locale parameter to the text recognition API [tor-browser] + * Bug 41947: Review Mozilla 1779005: Broken since Firefox 102.0: no instant fallback to direct connection when proxy became unreachable while runtime [tor-browser] + * Bug 41950: Review Mozilla 1788668: Add the possibility to check that the clipboard contains some pdfjs stuff [tor-browser] + * Bug 41951: Review Mozilla 1790681: Enable separatePrivateDefault by default [tor-browser] + * Bug 41959: Review Mozilla 1795944: Remove descriptionheightworkaround [tor-browser] + * Bug 41960: Review Mozilla 1797896: Proxy environment variables should be upper case / case insensitive [tor-browser] + * Bug 41961: Review Mozilla 1798868: Hide cookie banner handling UI by default [tor-browser] + * Bug 41969: Review Mozilla 1746983: Re-enable pingsender2 [tor-browser] + * Bug 41970: Review Mozilla 17909270: WebRTC bypasses Network settings & proxy.onRequest [tor-browser] + * Bug 41984: Rename languageNotification.ftl to base-browser.ftl [tor-browser] + * Bug 42013: Review Mozilla 1834374: Do not call EmptyClipboard() in nsBaseClipboard destructor [tor-browser] + * Bug 42014: Review Mozilla 1832791: Implement a Remote Settings for the Quarantined Domains pref [tor-browser] + * Bug 42015: Review Mozilla 1830890: Keep a history window of WebRTC stats for about:webrtc [tor-browser] + * Bug 42019: Empty browser's clipboard on browser shutdown [tor-browser] + * Bug 42026: Disable cookie banner service and UI. [tor-browser] + * Bug 42029: Defense-in-depth: disable non-proxied UDP WebRTC [tor-browser] + * Bug 42034: aboutTBUpdate.dtd is duplicated [tor-browser] + * Bug 42043: Disable gUM: media.devices.enumerate.legacy.enabled [tor-browser] + * Bug 42061: Move the alpha update channel creation to a commit on its own [tor-browser] + * Bug 42084: Race condition with language preferences may make spoof_english ineffective [tor-browser] + * Bug 42085: NEWNYM signal missing on Whonix [tor-browser] + * Bug 42094: Disable `media.aboutwebrtc.hist.enabled` as security in-depth [tor-browser] + * Bug 42120: Use foursquare as domain front for snowflake [tor-browser] + * Bug 40887: Update Webtunnel version to 38eb5505 [tor-browser-build] + * Windows + macOS + Linux + * Updated Firefox to 115.3.1esr + * Bug 30556: Re-evaluate letterboxing dimension choices [tor-browser] + * Bug 32328: Improve error recovery from the red screen of death [tor-browser] + * Bug 33282: Increase the max width of new windows [tor-browser] + * Bug 33955: Selecting "Copy image" from menu leaks the source URL to the clipboard. This data is often dereferenced by other applications. [tor-browser] + * Bug 40175: Connections in reader mode are not FPI [tor-browser] + * Bug 40982: Cleanup maps in tor-circuit-display [tor-browser] + * Bug 40983: Move not UI-related torbutton.js code to modules [tor-browser] + * Bug 41165: Crash with debug assertions enabled [tor-browser] + * Bug 41333: Modernize Tor Browser's new-tab page (about:tor) [tor-browser] + * Bug 41423: about:tor semantic and accessibility problems [tor-browser] + * Bug 41528: Hard-coded English "based on Mozilla Firefox" appears in version in "About" dialog [tor-browser] + * Bug 41581: ESR115: figure out extension pinning / unified Extensions [tor-browser] + * Bug 41639: Fix the wordmark (title and background) of the "About Tor Browser" window [tor-browser] + * Bug 41642: Do not hide new PBM in the hamburger menu if auto PBM is not enabled [tor-browser] + * Bug 41651: Use moz-toggle in connection preferences [tor-browser] + * Bug 41691: "Firefox Suggest" text appearing in UI [tor-browser] + * Bug 41717: Bookmark toolbar visibility on new tabs is not honored when new tab page is not about:blank [tor-browser] + * Bug 41739: Remove "Website appearance" [tor-browser] + * Bug 41741: Refactor the domain isolator and new circuit [tor-browser] + * Bug 41765: TTP-02-006 WP1: Information leaks via custom homepage (Low) [tor-browser] + * Bug 41766: TTP-02-001 WP1: XSS in TorConnect's captive portal (Info) [tor-browser] + * Bug 41771: Decide what to do for firefoxview [tor-browser] + * Bug 41774: Hide the new "Switching to a new device" help menu item [tor-browser] + * Bug 41791: Copying page contents also puts the source URL on the clipboard [tor-browser] + * Bug 41812: Review layout for XUL elements [tor-browser] + * Bug 41813: Look out for links missing underlines in ESR 115-based alphas [tor-browser] + * Bug 41821: Fix the proxy type in the proxy modal of about:preferences in 13.0 [tor-browser] + * Bug 41822: The default browser button came back on 115 [tor-browser] + * Bug 41833: Reload extensions on new identity [tor-browser] + * Bug 41834: Hide "Can't Be Removed - learn more" menu line for uninstallable add-ons [tor-browser] + * Bug 41842: Remove the old removal logics from Torbutton [tor-browser] + * Bug 41844: Stop using the control port directly [tor-browser] + * Bug 41845: Stop forcing (bad) pref values for non-PBM users [tor-browser] + * Bug 41852: Review the Tor Check Service UX [tor-browser] + * Bug 41864: TOR_CONTROL_HOST and TOR_SOCKS_HOST do not work as expected when the browser launches tor [tor-browser] + * Bug 41865: Use --text-color-deemphasized rather than --panel-description-color [tor-browser] + * Bug 41874: Visual & A11 regressions in add-on badges [tor-browser] + * Bug 41876: Remove Firefox View from title bar [tor-browser] + * Bug 41877: NoScript seems to be blocking by default in the first 115-based testbuild [tor-browser] + * Bug 41881: Developer tools/Network/New Request remembers requests [tor-browser] + * Bug 41886: Downloads drop-down panel has new-line/line-break between every word in the 'Be careful opening downloads' warning [tor-browser] + * Bug 41904: The log textarea doesn't resize anymore [tor-browser] + * Bug 41906: Hide about:preferences#privacy > DNS over HTTPS section [tor-browser] + * Bug 41907: The bootstrap is interrupted without any errors if the process becomes ready when already bootstrapping [tor-browser] + * Bug 41912: "Use Current Bridges" is shown for users even when there aren't any current bridges [tor-browser] + * Bug 41922: Unify the bridge line parsers [tor-browser] + * Bug 41923: The path normalization results in warnings [tor-browser] + * Bug 41924: Small refactors for TorProcess [tor-browser] + * Bug 41925: Remove the torbutton startup observer [tor-browser] + * Bug 41926: Refactor the control port client implementation [tor-browser] + * Bug 41931: Regression: new window leaks outer window [tor-browser] + * Bug 41935: Improve new window & letterboxing dimensions [tor-browser] + * Bug 41940: Review Mozilla 1739348: When a filetype is set to "always ask" and the user makes a save/open choice in the dialog, we should not also open the downloads panel [tor-browser] + * Bug 41949: Review Mozilla 1782578: Implement a context menu modal for text recognition [tor-browser] + * Bug 41954: Inputs in the request a bridge dialog are cut-off in 13.0 alpha [tor-browser] + * Bug 41957: Revert to Fx's default identity block style for internal pages [tor-browser] + * Bug 41958: Console error when closing tor browser with about:preferences open [tor-browser] + * Bug 41964: `emojiAnnotations` not defined in time in connection preferences [tor-browser] + * Bug 41965: TorConnect error when opening browser tools [tor-browser] + * Bug 41971: Update Tails URL in downloads warning [tor-browser] + * Bug 41973: Custom wingpanels don't line up with their toolbar icons in 13.0 alpha [tor-browser] + * Bug 41974: De-emphasized text in custom components is no longer gray in 13.0 alpha [tor-browser] + * Bug 41975: Downloads warning text too narrow in 13.0 alpha [tor-browser] + * Bug 41976: Bottom padding on collapsed bridge cards has increased in 13.0 alpha [tor-browser] + * Bug 41977: Hide the "Learn more" link in bridge cards [tor-browser] + * Bug 41980: Circuit display headline is misaligned in 13.0 alpha [tor-browser] + * Bug 41981: Review Mozilla 1800675: Add about:preferences entry for cookie banner handling [tor-browser] + * Bug 41983: Review Mozilla 1770447: Create a reusable "support-link" widget [tor-browser] + * Bug 41986: Fix the control port password handling [tor-browser] + * Bug 41994: CSS (and other assets) of some websites blocked in 13.0 alpha [tor-browser] + * Bug 42022: Prevent extension search engines from breaking the whole search system [tor-browser] + * Bug 42027: Create a Base Browser version of migrateUI [tor-browser] + * Bug 42037: Disable about:firefoxview [tor-browser] + * Bug 42041: TBB --allow-remote mixes up with plain Firefox [tor-browser] + * Bug 42045: Circuit panel overflows with long ipv6 addresses [tor-browser] + * Bug 42046: Remove XUL layout hacks from base browser [tor-browser] + * Bug 42047: Remove layout hacks from tor browser preferences [tor-browser] + * Bug 42050: Bring back Save As... dialog as default [tor-browser] + * Bug 42073: Add simplified onion pattern to the new homepage [tor-browser] + * Bug 42075: Fix link spacing and underline on new homepage [tor-browser] + * Bug 42079: TorConnect: handle switching from Bootstrapped to Configuring state [tor-browser] + * Bug 42083: RemoteSecuritySettings.init throws error in console [tor-browser] + * Bug 42091: Onion authorization prompt overflows [tor-browser] + * Bug 42092: Onion services key table display problems. [tor-browser] + * Bug 42098: Implement Windows installer icons [tor-browser] + * Bug 42100: Connect Assist dropdown text not centered [tor-browser] + * Bug 42102: TorProcess says the SOCKS port is not valid even though it is [tor-browser] + * Bug 42109: Onion services keys table has empty column headers. [tor-browser] + * Bug 42110: Add a utility module for shared UI methods needed for several tor browser components [tor-browser] + * Bug 42126: moat and connect assist broken for people who can't reach domain front [tor-browser] + * Bug 42129: Disable the Tor restart prompt if shouldStartAndOwnTor is false [tor-browser] + * Bug 42131: Tor Browser 13.0a5 does not track circuits created before Tor Browser started [tor-browser] + * Bug 42132: The new control port handling in Tor Browser 13 breaks a Tails security feature [tor-browser] + * Bug 42138: Disable apz.overscroll.enabled pref [tor-browser] + * Bug 42155: Drop the unused code for the old bridge removal warning [tor-browser] + * Bug 42159: Responsive Design Mode not working correctly [tor-browser] + * Bug 42160: Allow specifying a TOR_PROVIDER=none to configure only the proxy settings during the TorProviderBuilder initialization [tor-browser] + * Bug 42166: New identity dialog missing accessible name [tor-browser] + * Bug 42167: Make the preference auto-focus more reliable [tor-browser] + * Bug 40821: The update details URL is wrong in alphas [tor-browser-build] + * Bug 40893: Update (Noto) fonts for 13.0 [tor-browser-build] + * Bug 40924: Customize MOZ_APP_REMOTINGNAME instead of passing --name and --class [tor-browser-build] + * Bug 40938: Copy the new tor-browser.ftl file to the appropriate directory [tor-browser-build] + * Windows + Android + * Bug 40930: Upate zlib to 1.3 after 13.0a3 [tor-browser-build] + * Windows + * Bug 40737: Revert backout of Mozilla's fix for bug 1724777 [tor-browser] + * Bug 41658: Create new installer icons for Windows [tor-browser] + * Bug 41798: Stop building private_browsing.exe on Windows [tor-browser] + * Bug 41806: Prevent Private Browsing start menu item to be added automatically [tor-browser] + * Bug 41942: Review Mozilla 1682520: Use the WER runtime exception module to catch early crashes [tor-browser] + * Bug 41944: Review Mozilla 1774083: Add Surrogate COM Server to handle native Windows notifications when Firefox is closed. [tor-browser] + * Bug 42008: Review Mozilla 1808146: Copying images from Pixiv and pasting them in certain programs is broken [tor-browser] + * Bug 42010: Review Mozilla 1810641: Enable overscroll on Windows on all channels [tor-browser] + * Bug 42087: Implement Windows application icons [tor-browser] + * Bug 40954: Implement Windows installer icons [tor-browser-build] + * macOS + * Bug 41948: Review Mozilla 1782981: Hide the text recognition context menu if the macOS version doesn't support APIs [tor-browser] + * Bug 41955: Update macOS volume window background [tor-browser] + * Bug 41982: Review Mozilla 1762392: Add Cocoa platform support for paste files [tor-browser] + * Bug 42057: Disable Platform text-recognition functionality [tor-browser] + * Bug 42078: Implement MacOS application icons [tor-browser] + * Bug 42147: Add browser.helperApps.deleteTempFileOnExit to our profile [tor-browser] + * Linux + * Bug 41509: After update, KDE Plasma identifies Tor Browser Nightly window group as "firefox-nightly" [tor-browser] + * Bug 41884: Linux: set browser.tabs.searchclipboardfor.middleclick to false [tor-browser] + * Bug 42088: Implement Linux application icons [tor-browser] + * Bug 40576: Fontconfig warning: remove 'blank' configuration [tor-browser-build] + * Android + * Updated GeckoView to 115.3.1esr + * Bug 41878: firefox-mobile: refactor tor bootstrap off deleted onboarding path [tor-browser] + * Bug 41882: Update DuckDuckGo icons [tor-browser] + * Bug 41911: Firefox-Android tor bootstrap connect button css broken [tor-browser] + * Bug 41928: Backport Android-specific security fixes from Firefox 116 to ESR 102.14 / 115.1 - based Tor Browser [tor-browser] + * Bug 41972: Disable Firefox onboarding in 13.0 [tor-browser] + * Bug 41990: Review Mozilla 1811531: Add 'site' query parameter to Pocket sponsored stories request [tor-browser] + * Bug 41991: Review Mozilla 1812518: Allow a custom View for 3rd party downloads [tor-browser] + * Bug 41993: Review Mozilla 1810761: Add API for saving a PDF [tor-browser] + * Bug 41996: App includes com.google.android.gms.permission.AD_ID permission [tor-browser] + * Bug 41997: com.adjust.sdk.Adjust library enables AD_ID permission even though we aren't using it [tor-browser] + * Bug 41999: TB13.0a2 android: center text on connect button [tor-browser] + * Bug 42001: Hide 'Open links in external app' settings option and force defaults [tor-browser] + * Bug 42002: Review Mozilla 1809305: Allow user to copy an image to the clipboard [tor-browser] + * Bug 42003: Review Mozilla 1819431: Reimplement default browser notification with Nimbus Messaging equivalent [tor-browser] + * Bug 42004: Review Mozilla 1818015: Use a custom tab or the view we use for Sync onboarding for the Privacy button [tor-browser] + * Bug 42005: Review Mozilla 1816932: Add Maps to app links common sub domains [tor-browser] + * Bug 42006: Review Mozilla 1817726: Allow sharing current tab URL from Android's Recents (App Overview) screen. [tor-browser] + * Bug 42007: Review Mozilla 1805450: Allow users to submit site support requests in Fenix [tor-browser] + * Bug 42012: Review Mozilla 1810629: add an Android shortcut to go straight to the login and passwords page [tor-browser] + * Bug 42016: Review Mozilla 1832069: Implement Google Play Referrer Library to fetch referrer URL [tor-browser] + * Bug 42018: Rebase Firefox for Android to 115.2.1 [tor-browser] + * Bug 42023: Remove FF what's new from Android [tor-browser] + * Bug 42038: TBA Alpha - inscriptions Tor Browser Alpha and FireFox Browser simultaneously on the start screen [tor-browser] + * Bug 42074: YEC 2023 Takeover for Android Stable [tor-browser] + * Bug 42076: Theme is visible in options, but shouldn't be [tor-browser] + * Bug 42089: Disable the Cookie Banner Reduction site support requests (Mozilla 1805450) [tor-browser] + * Bug 42114: Disable Allow sharing current tab URL from Android's Recents screen in private browsing mode [tor-browser] + * Bug 42115: Enhanced Tracking Protection can still be enabled [tor-browser] + * Bug 42122: playstore console crashes: java.lang.NoSuchMethodError [tor-browser] + * Bug 42133: Remove "Total Cookie Protection" popup [tor-browser] + * Bug 42134: Remove Android icon shortcuts [tor-browser] + * Bug 42156: Screenshot allowing still blocks homescreen (android) [tor-browser] + * Bug 42157: Fix Help button URL [tor-browser] + * Bug 42165: Remove "Add to shortcuts" and "Remove from shortcuts" buttons [tor-browser] + * Bug 42158: Remove "Customize Homepage" button [tor-browser] + * Bug 40740: Tor Browser for Android's snowflake ClientTransportPlugin seems to be out of date [tor-browser-build] + * Bug 40919: Fix nimbus-fml reproducibility of 13.0a2-build1 [tor-browser-build] + * Bug 40941: Remove PT process options on Android [tor-browser-build] + * Build System + * All Platforms + * Updated Go to 1.21.1 + * Bug 42130: Add support for specifying the branch in `tb-dev rebase-on-default` [tor-browser] + * Bug 31588: Be smarter about vendoring for Rust projects [tor-browser-build] + * Bug 40089: Clean up usage of get-moz-build-date script [tor-browser-build] + * Bug 40410: Get rid of python2 [tor-browser-build] + * Bug 40487: Bump Python version [tor-browser-build] + * Bug 40741: Update browser and tor-android-service projects to pull data from pt_config.json [tor-browser-build] + * Bug 40802: Drop the patch for making WASI reproducible [tor-browser-build] + * Bug 40829: Review and standardize naming scheme for browser installer/package artifacts [tor-browser-build] + * Bug 40854: Update to OpenSSL 3.0 [tor-browser-build] + * Bug 40855: Update toolchains for Mozilla 115 [tor-browser-build] + * Bug 40868: Bump Rust to 1.69.0 [tor-browser-build] + * Bug 40880: The README doesn't include some dependencies needed for building incrementals [tor-browser-build] + * Bug 40886: Update README with instructions for Arch linux [tor-browser-build] + * Bug 40898: Add doc from tor-browser-spec/processes/ReleaseProcess to gitlab issue templates [tor-browser-build] + * Bug 40908: Enable the --enable-gpl config flag in tor to bring in PoW functionality [tor-browser-build] + * Bug 40929: Update go to 1.21 series after 13.0a3 [tor-browser-build] + * Bug 40932: Remove appname_bundle_android, appname_bundle_macos, appname_bundle_linux, appname_bundle_win32, appname_bundle_win64 from projects/release/update_responses_config.yml [tor-browser-build] + * Bug 40935: Fix fallout from build target rename in signing scripts [tor-browser-build] + * Bug 40948: Remove lyrebird-vendor sha256sum in nightly [tor-browser-build] + * Bug 40957: Expired subkey warning on Tor Browser GPG verification [tor-browser-build] + * Bug 40972: Handle Mullvad Browser in the changelog script and group entries by project [tor-browser-build] + * Windows + macOS + Linux + * Bug 41967: Add a Makefile recipe to create multi-lingual dev builds [tor-browser] + * Bug 40149: Remove patching of nightly update URL [tor-browser-build] + * Bug 40615: Consider adding a readme to the fonts directory [tor-browser-build] + * Bug 40907: Sometimes debug information are not deterministic with Clang 16.0.4 [tor-browser-build] + * Bug 40922: Use base-browser.ftl instead of languageNotification.ftl [tor-browser-build] + * Bug 40931: Fix incrementals after tor-browser-build#40829 [tor-browser-build] + * Bug 40933: Fix generating incrementals between 12.5.x and 13.0 [tor-browser-build] + * Bug 40942: Use the branch to build Base Browser [tor-browser-build] + * Bug 40944: After #40931, updates_responses is using incremental.mar files as if they were non-incremental mar files [tor-browser-build] + * Bug 40947: Remove migrate_langs from tools/signing/nightly/update-responses-base-config.yml [tor-browser-build] + * Bug 40956: Allow testing the updater also with release and alpha channel [tor-browser-build] + * Windows + * Bug 41995: Generated headers on Windows aren't reproducible [tor-browser] + * Bug 40832: Unify mingw-w64-clang 32+64 bits [tor-browser-build] + * Bug 40940: Change position of the `install|portable` in the builds filenames [tor-browser-build] + * macOS + * Bug 42035: Update tools/torbrowser/ scripts to support macOS dev environment [tor-browser] + * Bug 40943: Update libdmg-hfsplus to include our uplifted patch [tor-browser-build] + * Bug 40951: Firefox fails to build for macOS after tor-browser-build#40938 [tor-browser-build] + * Linux + * Bug 42071: tor-browser deployed format changed breaking fetch.sh [tor-browser] + * Bug 40102: Move from Debian Jessie to Debian Stretch for our Linux builds [tor-browser-build] + * Bug 40971: Stop shipping Linux i686 debug archive until we actually produce the symbols [tor-browser-build] + * Android + * Bug 41899: Use LLD for Android [tor-browser] + * Bug 40867: Create a RBM project for the unified Android repository [tor-browser-build] + * Bug 40917: Remove the uniffi-rs project [tor-browser-build] + * Bug 40918: The commit hash is still not displayed about:buildconfig on Android [tor-browser-build] + * Bug 40920: Non-deterministic generation of baseline.profm file in Android apks [tor-browser-build] + * Bug 40963: Tor Browesr 13.0 torbrowser-testbuild-android* targets fail to build [tor-browser-build] + * Bug 40974: firefox-android fails to build in release [tor-browser-build] + Tor Browser 13.0a6 - September 29 2023 * All Platforms * Updated tor to 0.4.8.7 ===================================== projects/browser/allowed_addons.json ===================================== @@ -17,7 +17,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/34/9734/13299734/13299734.pn…" } ], - "average_daily_users": 1015730, + "average_daily_users": 1023781, "categories": { "android": [ "experimental", @@ -31,7 +31,7 @@ "contributions_url": "https://opencollective.com/darkreader?utm_content=product-page-contribute&u…", "created": "2017-09-19T07:03:00Z", "current_version": { - "id": 5628331, + "id": 5631046, "compatibility": { "firefox": { "min": "54.0", @@ -42,7 +42,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/56283…", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/darkreader/versions/56310…", "is_strict_compatibility_enabled": false, "license": { "id": 22, @@ -53,22 +53,22 @@ "url": "http://www.opensource.org/license/mit" }, "release_notes": { - "en-US": "- UI improvements.\n- Users' fixes for websites." + "en-US": "- Fixed Site List (when some URL had a port).\n- Users' fixes for websites." }, - "reviewed": "2023-09-27T06:58:45Z", - "version": "4.9.66", + "reviewed": "2023-10-03T12:42:56Z", + "version": "4.9.67", "files": [ { - "id": 4172671, - "created": "2023-09-25T18:47:59Z", - "hash": "sha256:20b53356c36b0c76df614e2cb84e7ff3e1ab75b4fe2fd2bbca039026d018813f", + "id": 4175386, + "created": "2023-10-01T20:00:40Z", + "hash": "sha256:128a151f04af774463448fe1cdb944f6c5095fb17991f82d9aec3c8c4513308e", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 675035, + "size": 675277, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4172671/darkreader-4.9.66…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4175386/darkreader-4.9.67…", "permissions": [ "alarms", "contextMenus", @@ -146,7 +146,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-09-27T06:58:45Z", + "last_updated": "2023-10-03T12:42:56Z", "name": { "ar": "Dark Reader", "bn": "Dark Reader", @@ -221,9 +221,9 @@ "category": "recommended" }, "ratings": { - "average": 4.5529, - "bayesian_average": 4.551750086132407, - "count": 5167, + "average": 4.5548, + "bayesian_average": 4.553650148808013, + "count": 5182, "text_count": 1630 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/reviews/", @@ -321,7 +321,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/darkreader/versions/", - "weekly_downloads": 26198 + "weekly_downloads": 26757 }, "notes": null }, @@ -337,7 +337,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/56/7656/6937656/6937656.png?…" } ], - "average_daily_users": 257049, + "average_daily_users": 257919, "categories": { "android": [ "security-privacy" @@ -553,10 +553,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8129, - "bayesian_average": 4.808245170153086, - "count": 1363, - "text_count": 241 + "average": 4.8201, + "bayesian_average": 4.815424717092739, + "count": 1362, + "text_count": 239 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/reviews/", "requires_payment": false, @@ -641,7 +641,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/decentraleyes/versions/", - "weekly_downloads": 3111 + "weekly_downloads": 3661 }, "notes": null }, @@ -657,7 +657,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/73/4073/5474073/5474073.png?…" } ], - "average_daily_users": 1118348, + "average_daily_users": 1125441, "categories": { "android": [ "security-privacy" @@ -1181,10 +1181,10 @@ "category": "recommended" }, "ratings": { - "average": 4.8005, - "bayesian_average": 4.797737875525005, - "count": 2291, - "text_count": 436 + "average": 4.7962, + "bayesian_average": 4.793440331700814, + "count": 2296, + "text_count": 438 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/reviews/", "requires_payment": false, @@ -1208,7 +1208,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-badger17/versions/", - "weekly_downloads": 18647 + "weekly_downloads": 18664 }, "notes": null }, @@ -1224,7 +1224,7 @@ "picture_url": null } ], - "average_daily_users": 6595621, + "average_daily_users": 6647234, "categories": { "android": [ "security-privacy" @@ -1389,7 +1389,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-09-25T15:47:17Z", + "last_updated": "2023-10-07T16:35:31Z", "name": { "ar": "uBlock Origin", "bg": "uBlock Origin", @@ -1535,9 +1535,9 @@ }, "ratings": { "average": 4.783, - "bayesian_average": 4.782607382532181, - "count": 16057, - "text_count": 4165 + "bayesian_average": 4.782608236958109, + "count": 16130, + "text_count": 4186 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/reviews/", "requires_payment": false, @@ -1599,7 +1599,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/versions/", - "weekly_downloads": 144531 + "weekly_downloads": 157230 }, "notes": null }, @@ -1615,7 +1615,7 @@ "picture_url": null } ], - "average_daily_users": 170729, + "average_daily_users": 171186, "categories": { "android": [ "photos-media" @@ -1715,9 +1715,9 @@ }, "ratings": { "average": 4.4899, - "bayesian_average": 4.484788968165164, - "count": 1141, - "text_count": 425 + "bayesian_average": 4.484788501655236, + "count": 1143, + "text_count": 426 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/re…", "requires_payment": false, @@ -1739,7 +1739,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/video-background-play-fix/ve…", - "weekly_downloads": 320 + "weekly_downloads": 440 }, "notes": null }, @@ -1755,7 +1755,7 @@ "picture_url": null } ], - "average_daily_users": 86942, + "average_daily_users": 88145, "categories": { "android": [ "experimental", @@ -1893,7 +1893,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/privacy-possum/versions/", - "weekly_downloads": 2292 + "weekly_downloads": 1873 }, "notes": null }, @@ -1909,7 +1909,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/64/9064/12929064/12929064.pn…" } ], - "average_daily_users": 268632, + "average_daily_users": 270436, "categories": { "android": [ "photos-media", @@ -2128,9 +2128,9 @@ "category": "recommended" }, "ratings": { - "average": 4.6533, - "bayesian_average": 4.648688441384268, - "count": 1321, + "average": 4.6538, + "bayesian_average": 4.6491824699299755, + "count": 1323, "text_count": 255 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/reviews/", @@ -2152,7 +2152,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/search_by_image/versions/", - "weekly_downloads": 4242 + "weekly_downloads": 4914 }, "notes": null }, @@ -2175,7 +2175,7 @@ "picture_url": null } ], - "average_daily_users": 112240, + "average_daily_users": 113212, "categories": { "android": [ "other" @@ -2458,10 +2458,10 @@ "category": "recommended" }, "ratings": { - "average": 4.3746, - "bayesian_average": 4.370112364351098, - "count": 1260, - "text_count": 351 + "average": 4.3708, + "bayesian_average": 4.3663229339814045, + "count": 1265, + "text_count": 354 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/google-search-fixer/reviews/", "requires_payment": false, @@ -2497,7 +2497,7 @@ "picture_url": "https://addons.mozilla.org/user-media/userpics/43/0143/143/143.png?modified…" } ], - "average_daily_users": 306445, + "average_daily_users": 306753, "categories": { "android": [ "performance", @@ -2511,7 +2511,7 @@ "contributions_url": "https://www.paypal.com/donate/?hosted_button_id=9ERKTU5MBH4EW&utm_content=p…", "created": "2005-05-13T10:51:32Z", "current_version": { - "id": 5620645, + "id": 5634098, "compatibility": { "firefox": { "min": "59.0", @@ -2522,7 +2522,7 @@ "max": "*" } }, - "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5620645", + "edit_url": "https://addons.mozilla.org/en-US/developers/addon/noscript/versions/5634098", "is_strict_compatibility_enabled": false, "license": { "id": 13, @@ -2533,22 +2533,22 @@ "url": "http://www.gnu.org/licenses/gpl-2.0.html" }, "release_notes": { - "en-US": "v 11.4.27\n============================================================\nx [XSS] Better specificity of HTML elements preliminary\n checks\nx [XSS] Better specificity of potential fragmented injection\n through framework syntax detection (thanks Rom623, barbaz\n et al)\nx [nscl] RegExp.combo(): RegExp creation by combination for\n better readability and comments\nx [nscl] Replaced lib/sha256.js with web platform native\n implementation (thanks Martin for suggested patch)\nx [nscl] Fixed property/function mismatch (thanks Alex)\nx Fixed operators precedence issue #312 (thanks Alex)\nx [nscl] Prevent dead object access on BF cache (thanks\n jamhubub and mriehm)" + "en-US": "v 11.4.28\n============================================================\nx Prevent URL leaks from media placeholders (thanks NDevTK\n for report)\nx [nscl] Support for in-tree TLDs updates" }, - "reviewed": "2023-09-13T06:54:08Z", - "version": "11.4.27", + "reviewed": "2023-10-10T11:09:38Z", + "version": "11.4.28", "files": [ { - "id": 4164985, - "created": "2023-09-08T14:50:57Z", - "hash": "sha256:6b57d9afce663f801177b7492fe7f00967ee3e66b6351b2cf3ff2a6c3ca99637", + "id": 4178438, + "created": "2023-10-08T20:33:10Z", + "hash": "sha256:54d076b3226d454216117547f6441d2f95af3057d20f726e55d94b0f22573c14", "is_restart_required": false, "is_webextension": true, "is_mozilla_signed_extension": false, "platform": "all", - "size": 950105, + "size": 950895, "status": "public", - "url": "https://addons.mozilla.org/firefox/downloads/file/4164985/noscript-11.4.27.…", + "url": "https://addons.mozilla.org/firefox/downloads/file/4178438/noscript-11.4.28.…", "permissions": [ "contextMenus", "storage", @@ -2615,7 +2615,7 @@ }, "is_disabled": false, "is_experimental": false, - "last_updated": "2023-09-13T06:54:08Z", + "last_updated": "2023-10-10T11:09:38Z", "name": { "de": "NoScript", "el": "NoScript", @@ -2687,10 +2687,10 @@ "category": "recommended" }, "ratings": { - "average": 4.3975, - "bayesian_average": 4.39481198926411, - "count": 2118, - "text_count": 819 + "average": 4.3987, + "bayesian_average": 4.396010323665619, + "count": 2122, + "text_count": 820 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/reviews/", "requires_payment": false, @@ -2734,7 +2734,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/noscript/versions/", - "weekly_downloads": 7499 + "weekly_downloads": 7538 }, "notes": null }, @@ -2750,7 +2750,7 @@ "picture_url": null } ], - "average_daily_users": 153737, + "average_daily_users": 153782, "categories": { "android": [ "performance", @@ -2862,10 +2862,10 @@ "category": "recommended" }, "ratings": { - "average": 3.8896, - "bayesian_average": 3.8854127838445747, - "count": 1169, - "text_count": 420 + "average": 3.8752, + "bayesian_average": 3.871054464622849, + "count": 1178, + "text_count": 426 }, "ratings_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/revi…", "requires_payment": false, @@ -2884,7 +2884,7 @@ "type": "extension", "url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/", "versions_url": "https://addons.mozilla.org/en-US/firefox/addon/youtube-high-definition/vers…", - "weekly_downloads": 1730 + "weekly_downloads": 2142 }, "notes": null } ===================================== projects/browser/config ===================================== @@ -88,16 +88,16 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/4164985/noscript-11.4.27.… + - URL: https://addons.mozilla.org/firefox/downloads/file/4178438/noscript-11.4.28.… name: noscript - sha256sum: 6b57d9afce663f801177b7492fe7f00967ee3e66b6351b2cf3ff2a6c3ca99637 + sha256sum: 54d076b3226d454216117547f6441d2f95af3057d20f726e55d94b0f22573c14 - URL: https://addons.mozilla.org/firefox/downloads/file/4171020/ublock_origin-1.5… name: ublock-origin sha256sum: e8ee3f9d597a6d42db9d73fe87c1d521de340755fd8bfdd69e41623edfe096d6 enable: '[% c("var/mullvad-browser") %]' - - URL: https://github.com/mullvad/browser-extension/releases/download/v0.8.3-firef… + - URL: https://cdn.mullvad.net/browser-extension/0.8.4/mullvad-browser-extension-0… name: mullvad-extension - sha256sum: e531ce6e809091eb40848874ea9e695bce61196397b6d8238ab582a152e02ac7 + sha256sum: a0057a37482e178331cde7a6fd3c100315fcfc26e804aa37c9281f412d24cb79 enable: '[% c("var/mullvad-browser") %]' - filename: 'gtk3-settings.ini' enable: '[% c("var/linux") %]' ===================================== projects/firefox-android/config ===================================== @@ -16,7 +16,7 @@ container: var: fenix_version: 115.2.1 browser_branch: 13.0-1 - browser_build: 5 + browser_build: 6 variant: Beta # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 1 ===================================== projects/firefox/config ===================================== @@ -14,11 +14,11 @@ container: use_container: 1 var: - firefox_platform_version: 115.3.0 + firefox_platform_version: 115.3.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_series: '13.0' browser_branch: '[% c("var/browser_series") %]-1' - browser_build: 3 + browser_build: 2 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' @@ -86,7 +86,7 @@ targets: mullvadbrowser: git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git var: - browser_build: 4 + browser_build: 3 branding_directory_prefix: 'mb' gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/' ===================================== projects/geckoview/config ===================================== @@ -14,9 +14,9 @@ container: use_container: 1 var: - geckoview_version: 115.3.0esr + geckoview_version: 115.3.1esr browser_branch: 13.0-1 - browser_build: 3 + browser_build: 2 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' ===================================== projects/manual/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! -version: 102408 +version: 108500 filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' container: use_container: 1 @@ -21,8 +21,8 @@ var: input_files: - project: container-image - - URL: 'https://people.torproject.org/~richard/tbb_files/manual_[% c("version") %].zip' + - URL: 'https://build-sources.tbb.torproject.org/manual_[% c("version") %].zip' name: manual - sha256sum: f9c24f300f188276ee6ec7b8eb2f7e000ec49c9bb3651b4bd4468075885a9eef + sha256sum: f9fab9f904f0b584156ca7e3f5b4652f3dc9c849d52ab5923ca9d8e7ba2f6640 - filename: packagemanual.py name: package_script ===================================== projects/translation/config ===================================== @@ -12,13 +12,13 @@ compress_tar: 'gz' steps: base-browser: base-browser: '[% INCLUDE build %]' - git_hash: 066d24af02663ecfbf181541acd4ebd0988499ef + git_hash: 0b4625699b9e1d2a75e581a7424b126120c1c818 targets: nightly: git_hash: 'base-browser' tor-browser: tor-browser: '[% INCLUDE build %]' - git_hash: 99856dfcaf4538a76980bb2e4666658ef2040cb0 + git_hash: d404df763e6d3fbda42865b03733ccf2f89fe165 targets: nightly: git_hash: 'tor-browser' @@ -32,7 +32,7 @@ steps: fenix: '[% INCLUDE build %]' # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. - git_hash: 51045186952e0eab228e4c887914beceaff76583 + git_hash: 445042b596cad163f25342d17bc672a7ed5158d6 compress_tar: 'zst' targets: nightly: ===================================== rbm.conf ===================================== @@ -81,12 +81,12 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.0a6' + torbrowser_version: '13.0' torbrowser_build: 'build1' torbrowser_incremental_from: - - '13.0a3' - - '13.0a4' - - '13.0a5' + - '12.5.6' + - '12.5.5' + - '12.5.4' updater_enabled: 1 build_mar: 1 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40975: Don't include libstdc++ twice in Tor Browser
by boklm (＠boklm) 12 Oct '23

12 Oct '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8b293d6b by Nicolas Vigier at 2023-10-12T13:15:18+02:00 Bug 40975: Don't include libstdc++ twice in Tor Browser - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -312,7 +312,7 @@ END; [% IF c("var/linux") -%] /var/tmp/dist/gcc/bin/g++ $rootdir/abicheck.cc -o Browser/abicheck -std=c++17 - [% IF !c("var/torbrowser") -%] + [% IF !c("var/tor-browser") -%] libdest=Browser/libstdc++ mkdir -p "$libdest" # FIXME: tor-browser-build#40749 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update rbm for rbm#40062
by boklm (＠boklm) 12 Oct '23

12 Oct '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: b37820c5 by Nicolas Vigier at 2023-10-12T09:49:11+02:00 Update rbm for rbm#40062 - - - - - 1 changed file: - rbm Changes: ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit fb51b232ea9281032762df30211400139ff80275 +Subproject commit 0a47c75f7b9b3c6ccc4086b44336be0b85e5fbef View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/rbm][main] 2 commits: Bug 40062: Copy input_files directories recursively
by boklm (＠boklm) 12 Oct '23

12 Oct '23

boklm pushed to branch main at The Tor Project / Applications / RBM Commits: 063c41f9 by Nicolas Vigier at 2023-10-11T14:22:35+02:00 Bug 40062: Copy input_files directories recursively When an input_files is a directory, instead of passing each files included in the directory individually to remote_put, we just pass the directory and expect remote_put to copy it recursively. Since in the case of container, each call to remote_put is a significant overhead, this makes it much faster when including a directory containing many files. - - - - - 0a47c75f by Nicolas Vigier at 2023-10-11T14:32:44+02:00 Bug 40062: Avoid using run_chroot in copy_file_to When copying files to a container directory, we were running `chown` on the files using run_chroot, which in addition to using the chroot command is doing other things like setting up mount points and other things not needed for running `chown`. Simply using `chroot` should be enough and faster. - - - - - 2 changed files: - container - lib/RBM.pm Changes: ===================================== container ===================================== @@ -110,7 +110,7 @@ sub copy_file_to { my $filename = fileparse($src); rcopy($src, "$rootfsdir/$dst/$filename") or exit_error "Failed to copy $src to $rootfsdir/$dst/$filename"; - return run_chroot($rootfsdir, ['chown', '-R', $owner, $dst]); + return system('/usr/sbin/chroot', $rootfsdir, 'chown', '-R', $owner, $dst); } sub copy_file_from { ===================================== lib/RBM.pm ===================================== @@ -1091,7 +1091,8 @@ sub input_files { my $file_type = -d $fname ? 'directory' : 'file'; print "Using $file_type $fname\n"; mkdir dirname("$dest_dir/$name"); - push @res_copy, recursive_copy($fname, $name, $dest_dir, $action); + recursive_copy($fname, $name, $dest_dir, $action); + push @res_copy, $name; } chdir $old_cwd; RETURN_RES: View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/compare/fb51b232ea9281… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/compare/fb51b232ea9281… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.0] Bug 40974: Fix firefox-android with the release target.
by Pier Angelo Vendrame (＠pierov) 12 Oct '23

12 Oct '23

Pier Angelo Vendrame pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build Commits: bf0dfe66 by Pier Angelo Vendrame at 2023-10-11T09:51:01+02:00 Bug 40974: Fix firefox-android with the release target. In the firefox-android project we look for the geckoview artifacts to detect its version. For alpha and nightly its directory incldues the channel, so we were looking for `geckoview-release-omni`, but for release the directory is `geckoview-omni` only. - - - - - 1 changed file: - projects/firefox-android/build Changes: ===================================== projects/firefox-android/build ===================================== @@ -53,7 +53,12 @@ cd $builddir-[% c('version') %] patch -p1 < $rootdir/repos.diff sed -i 's|^$val VERSION = $.*|\1"[% c("var/as_version") %]"|' android-components/plugins/dependencies/src/main/java/ApplicationServices.kt sed -i 's|^$val CHANNEL = $.*|\1ApplicationServicesChannel.RELEASE|' android-components/plugins/dependencies/src/main/java/ApplicationServices.kt -gv_version=$(find "$distdir/geckoview/org/mozilla/geckoview/geckoview-[% c('var/variant') FILTER lower %]-omni" -mindepth 1 -maxdepth 1 -type d -printf '%f\n') +[% IF c("var/channel") == "release" -%] + gv_dir="$distdir/geckoview/org/mozilla/geckoview/geckoview-omni" +[% ELSE -%] + gv_dir="$distdir/geckoview/org/mozilla/geckoview/geckoview-[% c('var/variant') FILTER lower %]-omni" +[% END -%] +gv_version=$(find "$gv_dir" -mindepth 1 -maxdepth 1 -type d -printf '%f\n') sed -i "s|$\s*const val version = $.*|\1\"$gv_version\"|" android-components/plugins/dependencies/src/main/java/Gecko.kt sed -i 's|$\s*val channel = $.*|\1GeckoChannel.[% c("var/variant") FILTER upper %]|' android-components/plugins/dependencies/src/main/java/Gecko.kt View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-115.3.1esr-13.0-1-build3
by richard (＠richard) 12 Oct '23

12 Oct '23

richard pushed new tag mullvad-browser-115.3.1esr-13.0-1-build3 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.3.1esr-13.0-1-build2
by richard (＠richard) 12 Oct '23

12 Oct '23

richard pushed new tag tor-browser-115.3.1esr-13.0-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android] Pushed new tag firefox-android-115.2.1-13.0-1-build6
by Dan Ballard (＠dan) 11 Oct '23

11 Oct '23

Dan Ballard pushed new tag firefox-android-115.2.1-13.0-1-build6 at The Tor Project / Applications / firefox-android -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/tree/firef… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] Bug 42074: YEC 2023 Android
by Dan Ballard (＠dan) 11 Oct '23

11 Oct '23

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: 5b5fcba7 by Dan Ballard at 2023-10-11T22:23:27+00:00 Bug 42074: YEC 2023 Android - - - - - 12 changed files: - fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - fenix/app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt - fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt - + fenix/app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml - + fenix/app/src/main/res/drawable/tor_yec_popup_rounded_corners.xml - + fenix/app/src/main/res/drawable/yec_heart.xml - + fenix/app/src/main/res/drawable/yec_illustration_android.xml - + fenix/app/src/main/res/font/roboto_bold.ttf - + fenix/app/src/main/res/font/roboto_regular.ttf - fenix/app/src/main/res/layout/fragment_home.xml - fenix/app/src/main/res/values/colors.xml - fenix/app/src/main/res/values/styles.xml Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -20,8 +20,6 @@ import android.widget.PopupWindow import androidx.annotation.VisibleForTesting import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat -import androidx.core.view.children -import androidx.core.view.doOnLayout import androidx.core.view.isGone import androidx.core.view.isVisible import androidx.fragment.app.Fragment @@ -63,6 +61,8 @@ import mozilla.components.lib.state.ext.consumeFrom import mozilla.components.service.glean.private.NoExtras import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged +import mozilla.components.support.locale.LocaleManager +import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.GleanMetrics.HomeScreen import org.mozilla.fenix.GleanMetrics.PrivateBrowsingShortcutCfr @@ -112,6 +112,7 @@ import org.mozilla.fenix.perf.MarkersFragmentLifecycleCallbacks import org.mozilla.fenix.perf.runBlockingIncrement import org.mozilla.fenix.search.toolbar.DefaultSearchSelectorController import org.mozilla.fenix.search.toolbar.SearchSelectorMenu +import org.mozilla.fenix.settings.advanced.getSelectedLocale import org.mozilla.fenix.tabstray.TabsTrayAccessPoint import org.mozilla.fenix.tor.TorBootstrapFragmentDirections import org.mozilla.fenix.tor.TorBootstrapStatus @@ -136,6 +137,8 @@ class HomeFragment : Fragment() { private val homeViewModel: HomeScreenViewModel by activityViewModels() + private var hideYEC = false + private val snackbarAnchorView: View? get() = when (requireContext().settings().toolbarPosition) { ToolbarPosition.BOTTOM -> binding.toolbarLayout @@ -443,6 +446,27 @@ class HomeFragment : Fragment() { FxNimbus.features.homescreen.recordExposure() + controlYECDisplay() + + binding.donateNowButton.setOnClickListener { + val country = LocaleManager.getSelectedLocale(requireContext()).country + var locale = LocaleManager.getSelectedLocale(requireContext()).language + if (country != "") { + locale = "${locale}-${country}" + } + val localeUrl = "https://www.torproject.org/donate/2023yec-${locale}-mobile" + activity.openToBrowserAndLoad( + searchTermOrURL = localeUrl, + newTab = true, + from = BrowserDirection.FromHome + ) + } + + binding.yecClose.setOnClickListener { + this.hideYEC = true + controlYECDisplay() + } + // DO NOT MOVE ANYTHING BELOW THIS addMarker CALL! requireComponents.core.engine.profiler?.addMarker( MarkersFragmentLifecycleCallbacks.MARKER_NAME, @@ -452,6 +476,96 @@ class HomeFragment : Fragment() { return binding.root } + fun controlYECDisplay() { + val yec23show = ((activity as? HomeActivity)?.themeManager?.isYECActive ?: false) && ! this.hideYEC + + // hude onion pattern during EOY event + binding.onionPatternImage.apply { + visibility = if (!yec23show) { + View.VISIBLE + } else { + View.GONE + } + } + + // Hide tor browser header EOY event + binding.exploreprivately.apply { + visibility = if (!yec23show) { + View.VISIBLE + } else { + View.GONE + } + } + + // Hide EOY header text before EOY event + binding.yecIntroText.apply { + visibility = if (yec23show) { + View.VISIBLE + } else { + View.GONE + } + } + + + + // Hide the EOY image before EOY event + binding.yecIllustration.apply { + visibility = if (yec23show) { + View.VISIBLE + } else { + View.GONE + } + } + + binding.yecPleaseDonateText.apply { + visibility = if (yec23show) { + View.VISIBLE + } else { + View.GONE + } + } + binding.yecFreeToUse.apply { + visibility = if (yec23show) { + View.VISIBLE + } else { + View.GONE + } + } + + // Hide the EOY donate button before EOY event + binding.donateNowButton.apply { + visibility = if (yec23show) { + View.VISIBLE + } else { + View.GONE + } + } + + // Hide the EOY image before EOY event + binding.yecPopup.apply { + visibility = if (yec23show) { + View.VISIBLE + } else { + View.GONE + } + } + + binding.exploreprivately.apply { + visibility = if (yec23show) { + View.GONE + } else { + View.VISIBLE + } + } + + binding.homeAppBar.apply { + if (!yec23show){ + setExpanded(true, true) + } + } + + } + override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) ===================================== fenix/app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt ===================================== @@ -23,11 +23,20 @@ import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.customtabs.ExternalAppBrowserActivity +import java.util.Date abstract class ThemeManager { + // 1696118400000 // 2022 10 04 - testing + // 1697414400000 // 2023 10 16 + private val yec2023LaunchDate = Date(1697414400000) + // 1704067200000 // 2024 01 01 + private val yec2023EndDate = Date(1704067200000) + abstract var currentTheme: BrowsingMode + val isYECActive get() = Date().after(yec2023LaunchDate) && Date().before(yec2023EndDate) + /** * Returns the style resource corresponding to the [currentTheme]. */ ===================================== fenix/app/src/main/java/org/mozilla/fenix/tor/TorBootstrapFragment.kt ===================================== @@ -116,6 +116,10 @@ class TorBootstrapFragment : Fragment() { binding.toolbarLayout.apply { visibility = View.GONE } + + binding.yecPopup.apply { + visibility = View.GONE + } } // This function should be paired with adjustHomeFragmentView() ===================================== fenix/app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml ===================================== @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> + + + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="#FFBD4F" /> + <corners android:radius="10dp" /> +</shape> ===================================== fenix/app/src/main/res/drawable/tor_yec_popup_rounded_corners.xml ===================================== @@ -0,0 +1,5 @@ +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="#1F0333" /> + <corners android:radius="10dp" /> +</shape> ===================================== fenix/app/src/main/res/drawable/yec_heart.xml ===================================== @@ -0,0 +1,12 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="20dp" + android:height="20dp" + android:viewportWidth="16" + android:viewportHeight="16"> + <path + android:pathData="M8,6C8,6 8,2 11.5,2C15,2 15,5 15,6C15,10.5 8,15 8,15V6Z" + android:fillColor="#1C1B22"/> + <path + android:pathData="M8,6C8,6 8,2 4.5,2C1,2 1,5 1,6C1,10.5 8,15 8,15L9,9L8,6Z" + android:fillColor="#1C1B22"/> +</vector> ===================================== fenix/app/src/main/res/drawable/yec_illustration_android.xml ===================================== @@ -0,0 +1,294 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="166dp" + android:height="148dp" + android:viewportWidth="166" + android:viewportHeight="148"> + <path + android:pathData="M126.13,91.93L125.73,68.74L130.04,68.67L130.44,91.98H131.45C131.55,88.57 134.35,85.84 137.78,85.84H151.17C154.68,85.84 157.51,88.68 157.51,92.18V99.25C157.51,102.73 154.69,105.55 151.21,105.55C147.73,105.55 144.91,102.73 144.91,99.25V98.32C144.91,97.2 144,96.29 142.88,96.29H130.51L130.6,101.24H131.24C134.74,101.24 137.58,104.08 137.58,107.58V112.36C137.58,115.86 134.74,118.7 131.24,118.7H130.89L131.15,134.12C131.22,137.68 128.3,140.57 124.78,140.57C121.3,140.57 118.41,137.75 118.41,134.22V120.73C118.41,117.23 121.25,114.39 124.75,114.39H126.51L126.36,105.55H120.12C116.61,105.55 113.78,102.71 113.78,99.21V87.67C113.78,84.69 116.19,82.28 119.16,82.28C122.14,82.28 124.55,84.69 124.55,87.67V89.95C124.55,90.91 125.22,91.72 126.13,91.93ZM126.2,96.28C122.88,96.08 120.24,93.32 120.24,89.95V87.67C120.24,87.07 119.76,86.59 119.16,86.59C118.57,86.59 118.08,87.07 118.08,87.67V99.21C118.08,100.33 118.99,101.24 120.12,101.24H126.29L126.2,96.28ZM130.67,105.55L130.82,114.39H131.24C132.37,114.39 133.27,113.48 133.27,112.36V107.58C133.27,106.46 132.37,105.55 131.24,105.55H130.67ZM126.58,118.7H124.75C123.63,118.7 122.72,119.61 122.72,120.73V134.22C122.72,135.32 123.64,136.26 124.78,136.26C125.94,136.26 126.86,135.3 126.85,134.19L126.58,118.7ZM135.76,91.98H142.88C146.38,91.98 149.22,94.82 149.22,98.32V99.25C149.22,100.35 150.11,101.24 151.21,101.24C152.31,101.24 153.21,100.35 153.21,99.25V92.18C153.21,91.06 152.29,90.15 151.17,90.15H137.78C136.73,90.15 135.86,90.95 135.76,91.98Z" + android:strokeWidth="0.667939" + android:fillColor="#F5F5F5" + android:fillType="evenOdd" + android:strokeColor="#F5F5F5"/> + <path + android:pathData="M128.04,91.89L127.64,68.71L131.95,68.64L132.35,91.94H133.35C133.46,88.53 136.26,85.8 139.69,85.8H153.08C156.58,85.8 159.42,88.64 159.42,92.14V99.21C159.42,102.69 156.6,105.52 153.12,105.52C149.64,105.52 146.82,102.69 146.82,99.21V98.28C146.82,97.16 145.91,96.25 144.79,96.25H132.42L132.51,101.21H133.15C136.65,101.21 139.49,104.05 139.49,107.55V112.32C139.49,115.82 136.65,118.66 133.15,118.66H132.8L133.06,134.08C133.12,137.65 130.21,140.53 126.69,140.53C123.21,140.53 120.32,137.71 120.32,134.19V120.69C120.32,117.19 123.15,114.35 126.66,114.35H128.42L128.27,105.52H122.03C118.52,105.52 115.68,102.68 115.68,99.17V87.63C115.68,84.66 118.1,82.25 121.07,82.25C124.04,82.25 126.46,84.66 126.46,87.63V89.91C126.46,90.88 127.13,91.69 128.04,91.89ZM128.11,96.24C124.78,96.04 122.15,93.29 122.15,89.91V87.63C122.15,87.04 121.67,86.56 121.07,86.56C120.47,86.56 119.99,87.04 119.99,87.63V99.17C119.99,100.3 120.9,101.21 122.03,101.21H128.2L128.11,96.24ZM132.58,105.52L132.73,114.35H133.15C134.27,114.35 135.18,113.44 135.18,112.32V107.55C135.18,106.43 134.27,105.52 133.15,105.52H132.58ZM128.49,118.66H126.66C125.54,118.66 124.63,119.57 124.63,120.69V134.19C124.63,135.29 125.55,136.22 126.69,136.22C127.85,136.22 128.77,135.27 128.76,134.15L128.49,118.66ZM137.67,91.94H144.79C148.29,91.94 151.13,94.78 151.13,98.28V99.21C151.13,100.31 152.02,101.21 153.12,101.21C154.22,101.21 155.11,100.31 155.11,99.21V92.14C155.11,91.02 154.2,90.11 153.08,90.11H139.69C138.64,90.11 137.77,90.91 137.67,91.94Z" + android:strokeWidth="0.667939" + android:fillColor="#1F0333" + android:fillType="evenOdd" + android:strokeColor="#F5F5F5"/> + <path + android:pathData="M93.9,101.29H93.56V101.63V103.55C93.56,104.84 94.61,105.89 95.91,105.89H100.17C103.5,105.89 106.2,108.59 106.2,111.92V118.45C106.2,121.78 103.5,124.48 100.17,124.48H94.71C93.84,124.48 93.13,125.19 93.13,126.06C93.13,126.93 93.84,127.64 94.71,127.64H100.17C103.5,127.64 106.2,130.34 106.2,133.67V134.17C106.2,137.5 103.5,140.2 100.17,140.2H63.16C59.83,140.2 57.13,137.5 57.13,134.17V130.84C57.13,127.51 59.83,124.82 63.16,124.82H64.81C66.1,124.82 67.15,123.77 67.15,122.47V121.78C67.15,120.49 66.1,119.44 64.81,119.44H63.16C59.83,119.44 57.13,116.74 57.13,113.41V111.06C57.13,107.72 59.83,105.03 63.16,105.03H70.02C71.31,105.03 72.36,103.98 72.36,102.68V101.63V101.29H72.03H68.87C65.54,101.29 62.84,98.6 62.84,95.27V93.36C62.84,90.03 65.54,87.33 68.87,87.33H70.02C73.35,87.33 76.05,90.03 76.05,93.36V97.28V97.61H76.38H89.55H89.88V97.28V91.35V91.02H89.55H87.06C83.73,91.02 81.03,88.32 81.03,84.99V69.52H84.71V84.99C84.71,86.29 85.76,87.33 87.06,87.33H97.91C101.24,87.33 103.94,90.03 103.94,93.36V95.27C103.94,98.6 101.24,101.29 97.91,101.29H93.9ZM93.56,97.28V97.61H93.9H97.91C99.2,97.61 100.25,96.56 100.25,95.27V93.36C100.25,92.07 99.2,91.02 97.91,91.02H93.9H93.56V91.35V97.28ZM76.38,101.29H76.05V101.63V102.68C76.05,106.01 73.35,108.71 70.02,108.71H63.16C61.86,108.71 60.81,109.76 60.81,111.06V113.41C60.81,114.7 61.86,115.75 63.16,115.75H64.81C68.13,115.75 70.83,118.45 70.83,121.78V122.47C70.83,125.8 68.13,128.5 64.81,128.5H63.16C61.86,128.5 60.81,129.55 60.81,130.84V134.17C60.81,135.46 61.86,136.51 63.16,136.51H100.17C101.47,136.51 102.51,135.46 102.51,134.17V133.67C102.51,132.37 101.47,131.32 100.17,131.32H94.71C91.81,131.32 89.45,128.97 89.45,126.06C89.45,123.15 91.81,120.8 94.71,120.8H100.17C101.47,120.8 102.51,119.75 102.51,118.45V111.92C102.51,110.63 101.47,109.58 100.17,109.58H95.91C92.58,109.58 89.88,106.88 89.88,103.55V101.63V101.29H89.55H76.38ZM72.03,97.61H72.36V97.28V93.36C72.36,92.07 71.31,91.02 70.02,91.02H68.87C67.57,91.02 66.52,92.07 66.52,93.36V95.27C66.52,96.56 67.57,97.61 68.87,97.61H72.03Z" + android:strokeWidth="0.667939" + android:fillColor="#F5F5F5" + android:strokeColor="#F5F5F5"/> + <path + android:pathData="M95.81,101.29H95.47V101.63V103.55C95.47,104.84 96.52,105.89 97.82,105.89H102.08C105.41,105.89 108.11,108.59 108.11,111.92V118.45C108.11,121.78 105.41,124.48 102.08,124.48H96.62C95.75,124.48 95.04,125.19 95.04,126.06C95.04,126.93 95.75,127.64 96.62,127.64H102.08C105.41,127.64 108.11,130.34 108.11,133.67V134.17C108.11,137.5 105.41,140.2 102.08,140.2H65.07C61.74,140.2 59.04,137.5 59.04,134.17V130.84C59.04,127.51 61.74,124.82 65.07,124.82H66.71C68.01,124.82 69.06,123.77 69.06,122.47V121.78C69.06,120.49 68.01,119.44 66.71,119.44H65.07C61.74,119.44 59.04,116.74 59.04,113.41V111.06C59.04,107.72 61.74,105.03 65.07,105.03H71.93C73.22,105.03 74.27,103.98 74.27,102.68V101.63V101.29H73.94H70.78C67.45,101.29 64.75,98.6 64.75,95.27V93.36C64.75,90.03 67.45,87.33 70.78,87.33H71.93C75.26,87.33 77.96,90.03 77.96,93.36V97.28V97.61H78.29H91.45H91.79V97.28V91.35V91.02H91.45H88.96C85.64,91.02 82.94,88.32 82.94,84.99V69.52H86.62V84.99C86.62,86.29 87.67,87.33 88.96,87.33H99.82C103.15,87.33 105.85,90.03 105.85,93.36V95.27C105.85,98.6 103.15,101.29 99.82,101.29H95.81ZM95.47,97.28V97.61H95.81H99.82C101.11,97.61 102.16,96.56 102.16,95.27V93.36C102.16,92.07 101.11,91.02 99.82,91.02H95.81H95.47V91.35V97.28ZM78.29,101.29H77.96V101.63V102.68C77.96,106.01 75.26,108.71 71.93,108.71H65.07C63.77,108.71 62.72,109.76 62.72,111.06V113.41C62.72,114.7 63.77,115.75 65.07,115.75H66.71C70.04,115.75 72.74,118.45 72.74,121.78V122.47C72.74,125.8 70.04,128.5 66.71,128.5H65.07C63.77,128.5 62.72,129.55 62.72,130.84V134.17C62.72,135.46 63.77,136.51 65.07,136.51H102.08C103.37,136.51 104.42,135.46 104.42,134.17V133.67C104.42,132.37 103.37,131.32 102.08,131.32H96.62C93.71,131.32 91.36,128.97 91.36,126.06C91.36,123.15 93.71,120.8 96.62,120.8H102.08C103.37,120.8 104.42,119.75 104.42,118.45V111.92C104.42,110.63 103.37,109.58 102.08,109.58H97.82C94.49,109.58 91.79,106.88 91.79,103.55V101.63V101.29H91.45H78.29ZM73.94,97.61H74.27V97.28V93.36C74.27,92.07 73.22,91.02 71.93,91.02H70.78C69.48,91.02 68.43,92.07 68.43,93.36V95.27C68.43,96.56 69.48,97.61 70.78,97.61H73.94Z" + android:strokeWidth="0.667939" + android:fillColor="#1F0333" + android:strokeColor="#F5F5F5"/> + <path + android:pathData="M34.54,77.93V70.95H38.9V77.93C38.9,81.44 36.05,84.29 32.54,84.29H15.98C14.88,84.29 13.97,85.19 13.97,86.31C13.97,87.43 14.88,88.33 15.98,88.33H40.34V86.3C40.34,82.79 43.19,79.94 46.7,79.94H52.25C55.77,79.94 58.61,82.8 58.61,86.31C58.61,89.82 55.77,92.68 52.25,92.68H44.69V103.56C44.69,105.04 43.72,106.31 42.37,106.74V108.34C42.37,111.54 39.78,114.13 36.57,114.13H31.36V119.35H36.01C39.52,119.35 42.37,122.19 42.37,125.71V134.1C42.37,137.61 39.52,140.46 36.01,140.46H33.37C29.86,140.46 27.01,137.61 27.01,134.1V123.7H26.97C23.46,123.7 20.61,120.85 20.61,117.34V116.14C20.61,112.63 23.46,109.78 26.97,109.78H27.01V102.52C27.01,99.01 29.86,96.16 33.37,96.16H40.34V92.68H15.98C12.46,92.68 9.62,89.82 9.62,86.31C9.62,82.8 12.46,79.94 15.98,79.94H32.54C33.65,79.94 34.54,79.04 34.54,77.93ZM40.34,100.51H33.37C32.26,100.51 31.36,101.41 31.36,102.52V109.78H36.57C37.37,109.78 38.02,109.14 38.02,108.34V105.88C38.02,104.39 38.99,103.13 40.34,102.7V100.51ZM27.01,114.13H26.97C25.86,114.13 24.96,115.03 24.96,116.14V117.34C24.96,118.45 25.86,119.35 26.97,119.35H27.01V114.13ZM31.36,123.7V134.1C31.36,135.21 32.26,136.11 33.37,136.11H36.01C37.12,136.11 38.02,135.21 38.02,134.1V125.71C38.02,124.6 37.12,123.7 36.01,123.7H31.36ZM44.69,88.33H52.25C53.35,88.33 54.26,87.43 54.26,86.31C54.26,85.19 53.35,84.29 52.25,84.29H46.7C45.59,84.29 44.69,85.19 44.69,86.3V88.33Z" + android:strokeWidth="0.667939" + android:fillColor="#F5F5F5" + android:fillType="evenOdd" + android:strokeColor="#F5F5F5"/> + <path + android:pathData="M36.45,78.04V71.13H40.81V78.04C40.81,81.55 37.96,84.4 34.44,84.4H17.89C16.79,84.4 15.88,85.3 15.88,86.42C15.88,87.54 16.79,88.44 17.89,88.44H42.25V86.41C42.25,82.89 45.1,80.05 48.61,80.05H54.16C57.68,80.05 60.52,82.91 60.52,86.42C60.52,89.93 57.68,92.79 54.16,92.79H46.6V103.66C46.6,105.15 45.63,106.41 44.28,106.84V108.44C44.28,111.65 41.69,114.24 38.48,114.24H33.27V119.45H37.92C41.43,119.45 44.28,122.3 44.28,125.82V134.21C44.28,137.72 41.43,140.57 37.92,140.57H35.28C31.77,140.57 28.92,137.72 28.92,134.21V123.81H28.88C25.37,123.81 22.52,120.96 22.52,117.44V116.25C22.52,112.74 25.37,109.89 28.88,109.89H28.92V102.63C28.92,99.11 31.77,96.26 35.28,96.26H42.25V92.79H17.89C14.37,92.79 11.53,89.93 11.53,86.42C11.53,82.91 14.37,80.05 17.89,80.05H34.44C35.55,80.05 36.45,79.15 36.45,78.04ZM42.25,100.62H35.28C34.17,100.62 33.27,101.52 33.27,102.63V109.89H38.48C39.28,109.89 39.93,109.24 39.93,108.44V105.99C39.93,104.5 40.9,103.24 42.25,102.81V100.62ZM28.92,114.24H28.88C27.77,114.24 26.87,115.14 26.87,116.25V117.44C26.87,118.55 27.77,119.45 28.88,119.45H28.92V114.24ZM33.27,123.81V134.21C33.27,135.32 34.17,136.22 35.28,136.22H37.92C39.03,136.22 39.93,135.32 39.93,134.21V125.82C39.93,124.71 39.03,123.81 37.92,123.81H33.27ZM46.6,88.44H54.16C55.26,88.44 56.17,87.54 56.17,86.42C56.17,85.3 55.26,84.4 54.16,84.4H48.61C47.5,84.4 46.6,85.3 46.6,86.41V88.44Z" + android:strokeWidth="0.667939" + android:fillColor="#1F0333" + android:fillType="evenOdd" + android:strokeColor="#F5F5F5"/> + <path + android:pathData="M146.05,19.25C146.05,19.53 146.28,19.75 146.56,19.75C146.84,19.75 147.07,19.53 147.07,19.25V14.35L148.52,12.9C148.56,12.87 148.59,12.83 148.61,12.79H153.53C153.81,12.79 154.04,12.56 154.04,12.28C154.04,12 153.81,11.78 153.53,11.78H148.35L147.07,10.49V5.32C147.07,5.04 146.84,4.81 146.56,4.81C146.28,4.81 146.05,5.04 146.05,5.32V10.49L144.77,11.78H139.6C139.32,11.78 139.09,12 139.09,12.28C139.09,12.56 139.32,12.79 139.6,12.79H144.51C144.54,12.83 144.57,12.87 144.6,12.9L146.05,14.35V19.25Z" + android:fillColor="#F9F9F9"/> + <path + android:strokeWidth="1" + android:pathData="M146.05,19.25C146.05,19.53 146.28,19.75 146.56,19.75C146.84,19.75 147.07,19.53 147.07,19.25V14.35L148.52,12.9C148.56,12.87 148.59,12.83 148.61,12.79H153.53C153.81,12.79 154.04,12.56 154.04,12.28C154.04,12 153.81,11.78 153.53,11.78H148.35L147.07,10.49V5.32C147.07,5.04 146.84,4.81 146.56,4.81C146.28,4.81 146.05,5.04 146.05,5.32V10.49L144.77,11.78H139.6C139.32,11.78 139.09,12 139.09,12.28C139.09,12.56 139.32,12.79 139.6,12.79H144.51C144.54,12.83 144.57,12.87 144.6,12.9L146.05,14.35V19.25Z" + android:fillColor="#00000000" + android:strokeColor="#F9F9F9"/> + <path + android:pathData="M145.15,5.5L146.3,4.89L146.42,5.9L145.15,5.5Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M153.3,13.66L152.89,12.42L153.97,12.53L153.3,13.66Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M146.33,20.63L145.92,19.39L147.01,19.49L146.33,20.63Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M138.22,12.44L139.39,11.82L139.51,12.83L138.22,12.44Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M145.29,21.35C144.81,21.35 144.42,20.96 144.42,20.48V15.74L143.07,14.39C143.07,14.39 143.07,14.39 143.07,14.39C143.07,14.39 143.07,14.39 143.07,14.38H138.33C137.85,14.38 137.46,13.99 137.46,13.51C137.46,13.03 137.85,12.64 138.33,12.64H143.35L144.42,11.57V6.55C144.42,6.07 144.81,5.68 145.29,5.68C145.77,5.68 146.16,6.07 146.16,6.55V11.57L147.24,12.64H152.26C152.74,12.64 153.13,13.03 153.13,13.51C153.13,13.99 152.74,14.38 152.26,14.38H147.51C147.51,14.39 147.51,14.39 147.51,14.39C147.51,14.39 147.51,14.39 147.51,14.39L146.16,15.74V20.48C146.16,20.96 145.77,21.35 145.29,21.35ZM145.8,15.59L147.25,14.13C147.29,14.1 147.32,14.06 147.34,14.02H152.26C152.54,14.02 152.76,13.79 152.76,13.51C152.76,13.23 152.54,13.01 152.26,13.01H147.08L145.8,11.72V6.55C145.8,6.27 145.57,6.04 145.29,6.04C145.01,6.04 144.79,6.27 144.79,6.55V11.72L143.5,13.01H138.33C138.05,13.01 137.82,13.23 137.82,13.51C137.82,13.79 138.05,14.02 138.33,14.02H143.24C143.27,14.06 143.3,14.1 143.33,14.13L144.79,15.59V20.48C144.79,20.76 145.01,20.98 145.29,20.98C145.57,20.98 145.8,20.76 145.8,20.48V15.59Z" + android:fillColor="#F9F9F9" + android:fillType="evenOdd"/> + <path + android:pathData="M144.45,20.48C144.45,20.94 144.83,21.32 145.29,21.32C145.76,21.32 146.13,20.94 146.13,20.48V15.72L147.49,14.37C147.49,14.37 147.49,14.37 147.49,14.37C147.49,14.36 147.5,14.36 147.5,14.35H152.26C152.72,14.35 153.1,13.98 153.1,13.51C153.1,13.05 152.72,12.67 152.26,12.67H147.22L146.13,11.58V6.55C146.13,6.08 145.76,5.71 145.29,5.71C144.83,5.71 144.45,6.08 144.45,6.55V11.58L143.36,12.67H138.33C137.86,12.67 137.49,13.05 137.49,13.51C137.49,13.98 137.86,14.35 138.33,14.35H143.08C143.09,14.36 143.09,14.36 143.1,14.37L144.45,15.72V20.48Z" + android:strokeWidth="0.666912" + android:fillColor="#FBBE22" + android:strokeColor="#1F0333"/> + <path + android:pathData="M154.02,30.2C154.02,30.44 154.22,30.64 154.46,30.64C154.71,30.64 154.9,30.44 154.9,30.2V25.93L156.17,24.67C156.2,24.64 156.23,24.6 156.25,24.57H160.53C160.78,24.57 160.98,24.37 160.98,24.13C160.98,23.88 160.78,23.68 160.53,23.68H156.02L154.9,22.57V18.06C154.9,17.81 154.71,17.61 154.46,17.61C154.22,17.61 154.02,17.81 154.02,18.06V22.57L152.9,23.68H148.39C148.15,23.68 147.95,23.88 147.95,24.13C147.95,24.37 148.15,24.57 148.39,24.57H152.68C152.7,24.6 152.72,24.64 152.75,24.67L154.02,25.93V30.2Z" + android:fillColor="#F9F9F9"/> + <path + android:strokeWidth="1" + android:pathData="M154.02,30.2C154.02,30.44 154.22,30.64 154.46,30.64C154.71,30.64 154.9,30.44 154.9,30.2V25.93L156.17,24.67C156.2,24.64 156.23,24.6 156.25,24.57H160.53C160.78,24.57 160.98,24.37 160.98,24.13C160.98,23.88 160.78,23.68 160.53,23.68H156.02L154.9,22.57V18.06C154.9,17.81 154.71,17.61 154.46,17.61C154.22,17.61 154.02,17.81 154.02,18.06V22.57L152.9,23.68H148.39C148.15,23.68 147.95,23.88 147.95,24.13C147.95,24.37 148.15,24.57 148.39,24.57H152.68C152.7,24.6 152.72,24.64 152.75,24.67L154.02,25.93V30.2Z" + android:fillColor="#00000000" + android:strokeColor="#F9F9F9"/> + <path + android:pathData="M153.23,18.21L154.23,17.69L154.34,18.57L153.23,18.21Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M160.33,25.33L159.98,24.25L160.92,24.34L160.33,25.33Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M154.26,31.4L153.91,30.32L154.85,30.41L154.26,31.4Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M147.19,24.27L148.21,23.72L148.32,24.6L147.19,24.27Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M153.35,32.03C152.93,32.03 152.6,31.69 152.6,31.27V27.14L151.42,25.96C151.42,25.96 151.42,25.96 151.42,25.96C151.42,25.96 151.42,25.96 151.42,25.96H147.29C146.87,25.96 146.52,25.62 146.52,25.2C146.52,24.78 146.87,24.44 147.29,24.44H151.66L152.6,23.51V19.13C152.6,18.71 152.93,18.37 153.35,18.37C153.77,18.37 154.11,18.71 154.11,19.13V23.51L155.05,24.44H159.43C159.85,24.44 160.18,24.78 160.18,25.2C160.18,25.62 159.85,25.96 159.43,25.96H155.29C155.29,25.96 155.29,25.96 155.29,25.96C155.29,25.96 155.29,25.96 155.29,25.96L154.11,27.14V31.27C154.11,31.69 153.77,32.03 153.35,32.03ZM153.8,27.01L155.06,25.74C155.09,25.71 155.12,25.68 155.14,25.64H159.43C159.67,25.64 159.87,25.44 159.87,25.2C159.87,24.96 159.67,24.76 159.43,24.76H154.92L153.8,23.64V19.13C153.8,18.89 153.6,18.69 153.35,18.69C153.11,18.69 152.91,18.89 152.91,19.13V23.64L151.79,24.76H147.29C147.04,24.76 146.84,24.96 146.84,25.2C146.84,25.44 147.04,25.64 147.29,25.64H151.57C151.59,25.68 151.62,25.71 151.65,25.74L152.91,27.01V31.27C152.91,31.51 153.11,31.71 153.35,31.71C153.6,31.71 153.8,31.51 153.8,31.27V27.01Z" + android:fillColor="#F9F9F9" + android:fillType="evenOdd"/> + <path + android:pathData="M152.58,31.27C152.58,31.7 152.93,32.04 153.35,32.04C153.78,32.04 154.13,31.7 154.13,31.27V27.14L155.3,25.97H159.43C159.85,25.97 160.2,25.63 160.2,25.2C160.2,24.77 159.85,24.42 159.43,24.42H155.05L154.13,23.5V19.13C154.13,18.7 153.78,18.35 153.35,18.35C152.93,18.35 152.58,18.7 152.58,19.13V23.5L151.65,24.42H147.29C146.86,24.42 146.51,24.77 146.51,25.2C146.51,25.63 146.86,25.97 147.29,25.97H151.41L152.58,27.14V31.27Z" + android:strokeWidth="0.666912" + android:fillColor="#FBBE22" + android:strokeColor="#1F0333"/> + <path + android:pathData="M11.76,48.84C11.76,49.09 11.57,49.28 11.32,49.28C11.08,49.28 10.88,49.09 10.88,48.84V44.58L9.61,43.31C9.58,43.28 9.56,43.25 9.53,43.21H5.25C5.01,43.21 4.81,43.02 4.81,42.77C4.81,42.53 5.01,42.33 5.25,42.33H9.76L10.88,41.21V36.7C10.88,36.46 11.08,36.26 11.32,36.26C11.57,36.26 11.76,36.46 11.76,36.7V41.21L12.88,42.33H17.39C17.64,42.33 17.83,42.53 17.83,42.77C17.83,43.02 17.64,43.21 17.39,43.21H13.11C13.09,43.25 13.06,43.28 13.03,43.31L11.76,44.58V48.84Z" + android:fillColor="#F9F9F9"/> + <path + android:strokeWidth="1" + android:pathData="M11.76,48.84C11.76,49.09 11.57,49.28 11.32,49.28C11.08,49.28 10.88,49.09 10.88,48.84V44.58L9.61,43.31C9.58,43.28 9.56,43.25 9.53,43.21H5.25C5.01,43.21 4.81,43.02 4.81,42.77C4.81,42.53 5.01,42.33 5.25,42.33H9.76L10.88,41.21V36.7C10.88,36.46 11.08,36.26 11.32,36.26C11.57,36.26 11.76,36.46 11.76,36.7V41.21L12.88,42.33H17.39C17.64,42.33 17.83,42.53 17.83,42.77C17.83,43.02 17.64,43.21 17.39,43.21H13.11C13.09,43.25 13.06,43.28 13.03,43.31L11.76,44.58V48.84Z" + android:fillColor="#00000000" + android:strokeColor="#F9F9F9"/> + <path + android:pathData="M12.56,36.86L11.55,36.33L11.45,37.21L12.56,36.86Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M5.45,43.97L5.81,42.89L4.86,42.98L5.45,43.97Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M11.52,50.04L11.88,48.96L10.94,49.05L11.52,50.04Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M18.59,42.91L17.57,42.37L17.46,43.25L18.59,42.91Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M12.43,50.67C12.85,50.67 13.19,50.33 13.19,49.91V45.78L14.36,44.61C14.36,44.61 14.36,44.61 14.36,44.61C14.37,44.61 14.37,44.61 14.37,44.6H18.5C18.92,44.6 19.26,44.26 19.26,43.84C19.26,43.42 18.92,43.08 18.5,43.08H14.12L13.19,42.15V37.77C13.19,37.35 12.85,37.01 12.43,37.01C12.01,37.01 11.67,37.35 11.67,37.77V42.15L10.74,43.08H6.36C5.94,43.08 5.6,43.42 5.6,43.84C5.6,44.26 5.94,44.6 6.36,44.6H10.49C10.49,44.61 10.49,44.61 10.5,44.61C10.5,44.61 10.5,44.61 10.5,44.61L11.67,45.78V49.91C11.67,50.33 12.01,50.67 12.43,50.67ZM11.99,45.65L10.72,44.38C10.69,44.35 10.66,44.32 10.64,44.29H6.36C6.12,44.29 5.92,44.09 5.92,43.84C5.92,43.6 6.12,43.4 6.36,43.4H10.87L11.99,42.28V37.77C11.99,37.53 12.19,37.33 12.43,37.33C12.67,37.33 12.87,37.53 12.87,37.77V42.28L13.99,43.4H18.5C18.74,43.4 18.94,43.6 18.94,43.84C18.94,44.09 18.74,44.29 18.5,44.29H14.22C14.2,44.32 14.17,44.35 14.14,44.38L12.87,45.65V49.91C12.87,50.16 12.67,50.36 12.43,50.36C12.19,50.36 11.99,50.16 11.99,49.91V45.65Z" + android:fillColor="#F9F9F9" + android:fillType="evenOdd"/> + <path + android:pathData="M13.21,49.91C13.21,50.34 12.86,50.69 12.43,50.69C12,50.69 11.65,50.34 11.65,49.91V45.79L10.49,44.62H6.36C5.93,44.62 5.58,44.27 5.58,43.84C5.58,43.42 5.93,43.07 6.36,43.07H10.73L11.65,42.14V37.77C11.65,37.35 12,37 12.43,37C12.86,37 13.21,37.35 13.21,37.77V42.14L14.13,43.07H18.5C18.93,43.07 19.28,43.42 19.28,43.84C19.28,44.27 18.93,44.62 18.5,44.62H14.37L13.21,45.79V49.91Z" + android:strokeWidth="0.666912" + android:fillColor="#FBBE22" + android:strokeColor="#1F0333"/> + <path + android:pathData="M82.61,121.73C82.61,121.98 82.8,122.17 83.05,122.17C83.29,122.17 83.49,121.98 83.49,121.73V117.47L84.76,116.2C84.79,116.17 84.81,116.14 84.84,116.1H89.12C89.36,116.1 89.56,115.91 89.56,115.66C89.56,115.42 89.36,115.22 89.12,115.22H84.61L83.49,114.1V109.59C83.49,109.35 83.29,109.15 83.05,109.15C82.8,109.15 82.61,109.35 82.61,109.59V114.1L81.49,115.22H76.98C76.73,115.22 76.54,115.42 76.54,115.66C76.54,115.91 76.73,116.1 76.98,116.1H81.26C81.28,116.14 81.31,116.17 81.34,116.2L82.61,117.47V121.73Z" + android:fillColor="#F9F9F9"/> + <path + android:strokeWidth="1" + android:pathData="M82.61,121.73C82.61,121.98 82.8,122.17 83.05,122.17C83.29,122.17 83.49,121.98 83.49,121.73V117.47L84.76,116.2C84.79,116.17 84.81,116.14 84.84,116.1H89.12C89.36,116.1 89.56,115.91 89.56,115.66C89.56,115.42 89.36,115.22 89.12,115.22H84.61L83.49,114.1V109.59C83.49,109.35 83.29,109.15 83.05,109.15C82.8,109.15 82.61,109.35 82.61,109.59V114.1L81.49,115.22H76.98C76.73,115.22 76.54,115.42 76.54,115.66C76.54,115.91 76.73,116.1 76.98,116.1H81.26C81.28,116.14 81.31,116.17 81.34,116.2L82.61,117.47V121.73Z" + android:fillColor="#00000000" + android:strokeColor="#F9F9F9"/> + <path + android:pathData="M81.81,109.75L82.82,109.22L82.92,110.1L81.81,109.75Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M88.92,116.86L88.56,115.78L89.51,115.87L88.92,116.86Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M82.85,122.93L82.49,121.85L83.43,121.94L82.85,122.93Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M75.78,115.8L76.8,115.26L76.91,116.14L75.78,115.8Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M81.94,123.56C81.52,123.56 81.18,123.22 81.18,122.81V118.67L80.01,117.5C80.01,117.5 80.01,117.5 80.01,117.5C80,117.5 80,117.5 80,117.49H75.87C75.45,117.49 75.11,117.15 75.11,116.74C75.11,116.32 75.45,115.97 75.87,115.97H80.25L81.18,115.04V110.66C81.18,110.25 81.52,109.9 81.94,109.9C82.36,109.9 82.7,110.25 82.7,110.66V115.04L83.63,115.97H88.01C88.43,115.97 88.77,116.32 88.77,116.74C88.77,117.15 88.43,117.49 88.01,117.49H83.88C83.88,117.5 83.88,117.5 83.87,117.5C83.87,117.5 83.87,117.5 83.87,117.5L82.7,118.67V122.81C82.7,123.22 82.36,123.56 81.94,123.56ZM82.38,118.54L83.65,117.27C83.68,117.24 83.71,117.21 83.73,117.18H88.01C88.25,117.18 88.45,116.98 88.45,116.74C88.45,116.49 88.25,116.29 88.01,116.29H83.5L82.38,115.17V110.66C82.38,110.42 82.18,110.22 81.94,110.22C81.7,110.22 81.5,110.42 81.5,110.66V115.17L80.38,116.29H75.87C75.63,116.29 75.43,116.49 75.43,116.74C75.43,116.98 75.63,117.18 75.87,117.18H80.15C80.17,117.21 80.2,117.24 80.23,117.27L81.5,118.54V122.81C81.5,123.05 81.7,123.25 81.94,123.25C82.18,123.25 82.38,123.05 82.38,122.81V118.54Z" + android:fillColor="#F9F9F9" + android:fillType="evenOdd"/> + <path + android:pathData="M81.16,122.81C81.16,123.23 81.51,123.58 81.94,123.58C82.37,123.58 82.72,123.23 82.72,122.81V118.68L83.88,117.51H88.01C88.44,117.51 88.79,117.16 88.79,116.74C88.79,116.31 88.44,115.96 88.01,115.96H83.64L82.72,115.04V110.66C82.72,110.24 82.37,109.89 81.94,109.89C81.51,109.89 81.16,110.24 81.16,110.66V115.04L80.24,115.96H75.87C75.44,115.96 75.09,116.31 75.09,116.74C75.09,117.16 75.44,117.51 75.87,117.51H80L81.16,118.68V122.81Z" + android:strokeWidth="0.666912" + android:fillColor="#FBBE22" + android:strokeColor="#1F0333"/> + <path + android:pathData="M84.51,36.84L84.84,36.89C84.86,36.75 84.8,36.62 84.68,36.55C84.57,36.48 84.42,36.49 84.32,36.57L84.51,36.84ZM83.78,37.36L83.58,37.09L83.58,37.09L83.78,37.36ZM83.62,37.31L83.94,37.21L83.94,37.21L83.62,37.31ZM84.55,23.09L84.5,23.43C84.52,23.43 84.53,23.43 84.55,23.43L84.55,23.09ZM85.33,28.82L85,28.8C84.99,28.98 85.12,29.13 85.29,29.15C85.47,29.17 85.63,29.06 85.66,28.88L85.33,28.82ZM90.05,20.62L90.2,20.32C90.19,20.32 90.18,20.31 90.16,20.31L90.05,20.62ZM88.55,29.32L88.24,29.19C88.18,29.33 88.22,29.49 88.34,29.58C88.47,29.67 88.63,29.67 88.75,29.58L88.55,29.32ZM91.5,28.25L91.56,27.92L91.56,27.92L91.5,28.25ZM91.65,29.17L91.41,28.93L91.41,28.93L91.65,29.17ZM86.94,38.3L86.6,38.29L86.6,38.29L86.94,38.3ZM84.38,38.29L84.05,38.28L84.05,38.28L84.38,38.29ZM84.32,36.57L83.58,37.09L83.97,37.63L84.7,37.11L84.32,36.57ZM83.58,37.09C83.71,37 83.89,37.06 83.94,37.21L83.3,37.4C83.38,37.69 83.73,37.81 83.97,37.63L83.58,37.09ZM83.94,37.21C82.92,33.77 82.63,30.2 82.85,27.52C82.96,26.18 83.2,25.09 83.53,24.36C83.69,24 83.87,23.74 84.04,23.59C84.2,23.45 84.35,23.41 84.5,23.43L84.59,22.76C84.21,22.71 83.88,22.85 83.6,23.09C83.32,23.33 83.1,23.67 82.92,24.09C82.55,24.91 82.3,26.09 82.18,27.46C81.95,30.22 82.25,33.89 83.3,37.4L83.94,37.21ZM84.55,23.43C84.58,23.43 84.67,23.44 84.78,23.69C84.89,23.94 84.97,24.33 85.01,24.85C85.11,25.87 85.07,27.28 85,28.8L85.67,28.83C85.73,27.32 85.78,25.87 85.68,24.79C85.63,24.25 85.55,23.78 85.4,23.43C85.25,23.08 84.98,22.76 84.55,22.76L84.55,23.43ZM85.66,28.88C86.1,26.6 86.73,24.4 87.51,22.87C87.9,22.1 88.32,21.53 88.73,21.2C89.14,20.88 89.53,20.79 89.94,20.94L90.16,20.31C89.49,20.07 88.86,20.24 88.32,20.67C87.79,21.09 87.32,21.76 86.92,22.56C86.1,24.18 85.45,26.45 85,28.76L85.66,28.88ZM89.91,20.92C90.16,21.05 90.33,21.31 90.39,21.79C90.44,22.27 90.37,22.92 90.18,23.69C89.82,25.24 89.05,27.19 88.24,29.19L88.86,29.44C89.67,27.45 90.46,25.45 90.84,23.85C91.03,23.04 91.12,22.31 91.05,21.71C90.98,21.11 90.74,20.59 90.2,20.32L89.91,20.92ZM88.75,29.58C89.76,28.79 90.72,28.46 91.45,28.58L91.56,27.92C90.56,27.76 89.41,28.21 88.34,29.05L88.75,29.58ZM91.45,28.58C91.49,28.59 91.5,28.6 91.5,28.61C91.51,28.61 91.52,28.63 91.52,28.66C91.53,28.73 91.5,28.84 91.41,28.93L91.88,29.41C92.11,29.18 92.22,28.87 92.19,28.58C92.15,28.27 91.94,27.98 91.56,27.92L91.45,28.58ZM91.41,28.93C90.16,30.14 88.98,31.9 88.1,33.63C87.23,35.36 86.63,37.1 86.6,38.29L87.27,38.3C87.3,37.27 87.84,35.64 88.7,33.94C89.56,32.25 90.7,30.55 91.88,29.41L91.41,28.93ZM86.6,38.29C86.6,38.16 86.71,38.06 86.83,38.06V38.73C87.07,38.73 87.26,38.55 87.27,38.3L86.6,38.29ZM86.83,38.06H84.48V38.73H86.83V38.06ZM84.48,38.06C84.62,38.06 84.72,38.17 84.72,38.3L84.05,38.28C84.04,38.53 84.23,38.73 84.48,38.73V38.06ZM84.72,38.3C84.73,37.82 84.77,37.35 84.84,36.89L84.18,36.79C84.11,37.27 84.06,37.77 84.05,38.28L84.72,38.3Z" + android:fillColor="#F5F5F5"/> + <path + android:pathData="M82.07,39C80.62,40.13 79.16,40.92 77.61,41.81C84.53,41.86 95.63,43.4 94.14,42.54C92.36,41.51 89.67,39.69 88.59,38.5C87.52,37.3 83.89,37.58 82.07,39Z" + android:fillColor="#B27AF4"/> + <path + android:pathData="M89.33,39.24C88.76,38.59 87.75,37.44 87.82,35.96C87.86,35.28 87.88,34.85 87.91,34.57C87.92,34.46 87.63,34.24 87.53,34.29C86.49,34.8 85.42,34.87 83.37,34.87C83.31,34.87 83.27,34.92 83.27,34.98C83.32,36.21 82.66,38.46 81.78,39.23C81.42,39.54 82.14,39.68 83.31,39.72C75.58,40.81 69.6,48.02 69.6,56.76C69.6,61.87 71.65,66.46 74.9,69.61C77.27,71.9 79.92,72.57 83.44,73.45C83.73,73.52 84.03,73.6 84.33,73.67C85,73.84 85.7,73.86 86.37,73.72C90.57,72.84 93.22,72.1 95.79,69.61C99.04,66.46 101.09,61.87 101.09,56.76C101.09,47.74 94.73,40.35 86.63,39.63C87.61,39.57 88.55,39.49 89.27,39.4C89.35,39.39 89.38,39.3 89.33,39.24Z" + android:fillColor="#B27AF4"/> + <path + android:pathData="M97.87,56.9C97.87,64.12 92.25,69.95 85.36,69.95C78.46,69.95 72.85,64.12 72.85,56.9C72.85,49.68 78.46,43.86 85.36,43.86C92.25,43.86 97.87,49.68 97.87,56.9Z" + android:strokeWidth="0.669091" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M95.19,56.9C95.19,62.57 90.77,67.14 85.36,67.14C79.94,67.14 75.53,62.57 75.53,56.9C75.53,51.23 79.94,46.66 85.36,46.66C90.77,46.66 95.19,51.23 95.19,56.9Z" + android:strokeWidth="0.669091" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M92.54,56.9C92.54,61.04 89.32,64.38 85.36,64.38C81.4,64.38 78.17,61.04 78.17,56.9C78.17,52.76 81.4,49.43 85.36,49.43C89.32,49.43 92.54,52.76 92.54,56.9Z" + android:strokeWidth="0.669091" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M90.15,56.9C90.15,59.68 87.99,61.91 85.36,61.91C82.73,61.91 80.57,59.68 80.57,56.9C80.57,54.13 82.73,51.9 85.36,51.9C87.99,51.9 90.15,54.13 90.15,56.9Z" + android:strokeWidth="0.669091" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M87.83,56.9C87.83,58.34 86.71,59.48 85.36,59.48C84.01,59.48 82.89,58.34 82.89,56.9C82.89,55.47 84.01,54.33 85.36,54.33C86.71,54.33 87.83,55.47 87.83,56.9Z" + android:strokeWidth="0.669091" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M129.44,36.85L129.77,36.89C129.79,36.76 129.73,36.63 129.62,36.56C129.5,36.49 129.36,36.5 129.25,36.57L129.44,36.85ZM128.71,37.37L128.9,37.64L128.9,37.64L128.71,37.37ZM128.55,37.31L128.87,37.22L128.87,37.22L128.55,37.31ZM129.48,23.11L129.44,23.44C129.45,23.44 129.46,23.44 129.48,23.44L129.48,23.11ZM130.27,28.83L129.93,28.81C129.92,28.99 130.05,29.14 130.23,29.16C130.4,29.18 130.56,29.07 130.59,28.89L130.27,28.83ZM134.98,20.64L135.13,20.34C135.12,20.33 135.11,20.33 135.1,20.32L134.98,20.64ZM133.48,29.33L133.17,29.2C133.11,29.34 133.15,29.5 133.27,29.59C133.4,29.68 133.56,29.68 133.68,29.59L133.48,29.33ZM136.43,28.26L136.38,28.59L136.38,28.59L136.43,28.26ZM136.58,29.18L136.34,28.94L136.34,28.94L136.58,29.18ZM131.87,38.3L131.53,38.29L131.53,38.29L131.87,38.3ZM129.31,38.3L128.98,38.29L128.98,38.29L129.31,38.3ZM129.25,36.57L128.52,37.09L128.9,37.64L129.64,37.12L129.25,36.57ZM128.52,37.09C128.65,37 128.83,37.06 128.87,37.22L128.23,37.41C128.32,37.69 128.66,37.81 128.9,37.64L128.52,37.09ZM128.87,37.22C127.85,33.78 127.56,30.21 127.79,27.53C127.9,26.19 128.14,25.1 128.46,24.37C128.62,24.01 128.8,23.76 128.97,23.61C129.13,23.46 129.29,23.42 129.44,23.44L129.52,22.78C129.15,22.73 128.81,22.86 128.53,23.1C128.26,23.34 128.04,23.69 127.85,24.1C127.48,24.92 127.23,26.1 127.12,27.48C126.89,30.23 127.19,33.89 128.23,37.41L128.87,37.22ZM129.48,23.44C129.52,23.44 129.61,23.45 129.71,23.71C129.82,23.96 129.9,24.34 129.95,24.86C130.04,25.88 130,27.29 129.93,28.81L130.6,28.84C130.67,27.33 130.71,25.88 130.61,24.8C130.57,24.27 130.48,23.79 130.33,23.44C130.18,23.1 129.92,22.77 129.48,22.77L129.48,23.44ZM130.59,28.89C131.04,26.62 131.67,24.41 132.44,22.88C132.83,22.11 133.25,21.54 133.67,21.21C134.07,20.89 134.46,20.81 134.87,20.95L135.1,20.32C134.42,20.08 133.79,20.26 133.25,20.69C132.72,21.11 132.26,21.77 131.85,22.58C131.03,24.19 130.38,26.46 129.94,28.77L130.59,28.89ZM134.84,20.94C135.1,21.06 135.26,21.33 135.32,21.8C135.37,22.29 135.3,22.93 135.12,23.7C134.75,25.25 133.98,27.2 133.17,29.2L133.79,29.45C134.6,27.46 135.39,25.46 135.77,23.86C135.96,23.06 136.05,22.32 135.98,21.73C135.91,21.12 135.67,20.6 135.13,20.34L134.84,20.94ZM133.68,29.59C134.69,28.8 135.65,28.47 136.38,28.59L136.49,27.93C135.49,27.77 134.34,28.22 133.27,29.06L133.68,29.59ZM136.38,28.59C136.42,28.6 136.43,28.61 136.43,28.62C136.44,28.62 136.45,28.64 136.45,28.67C136.46,28.74 136.43,28.85 136.34,28.94L136.81,29.42C137.04,29.19 137.15,28.88 137.12,28.59C137.08,28.28 136.87,28 136.49,27.93L136.38,28.59ZM136.34,28.94C135.1,30.15 133.91,31.91 133.04,33.64C132.16,35.36 131.56,37.11 131.53,38.29L132.2,38.31C132.23,37.28 132.77,35.64 133.63,33.95C134.49,32.26 135.63,30.56 136.81,29.42L136.34,28.94ZM131.53,38.29C131.54,38.17 131.64,38.07 131.76,38.07V38.74C132,38.74 132.2,38.55 132.2,38.31L131.53,38.29ZM131.76,38.07H129.42V38.74H131.76V38.07ZM129.42,38.07C129.55,38.07 129.65,38.18 129.65,38.31L128.98,38.29C128.97,38.53 129.17,38.74 129.42,38.74V38.07ZM129.65,38.31C129.66,37.82 129.71,37.35 129.77,36.89L129.11,36.8C129.04,37.28 129,37.78 128.98,38.29L129.65,38.31Z" + android:fillColor="#F5F5F5"/> + <path + android:pathData="M126.82,40.36C125.38,41.49 121.93,43.73 120.39,44.62C127.26,44.67 139.3,43.87 137.82,43.01C134.87,41.3 134.36,41.05 133.29,39.86C132.23,38.68 128.62,38.95 126.82,40.36Z" + android:fillColor="#B27AF4"/> + <path + android:pathData="M134.02,40.6C133.46,39.96 132.45,38.88 132.53,37.34C132.56,36.66 132.59,36.24 132.61,35.96C132.62,35.85 132.34,35.63 132.24,35.68C131.2,36.19 130.14,36.26 128.11,36.26C128.05,36.26 128,36.31 128.01,36.37C127.83,39.13 127.83,39.5 126.53,40.59C126.18,40.89 126.86,41.03 127.97,41.07C118.96,43.94 114.44,48.52 114.44,56.32C114.44,60.9 116.47,65.01 119.7,67.83C122.05,69.89 124.68,70.48 128.18,71.27C128.49,71.34 128.82,71.42 129.16,71.49C129.76,71.63 130.38,71.65 130.99,71.53C135.21,70.73 137.87,70.08 140.44,67.83C143.67,65.01 145.7,60.9 145.7,56.32C145.7,48.26 139.4,41.64 131.39,40.99C132.34,40.93 133.26,40.84 133.96,40.76C134.04,40.75 134.08,40.66 134.02,40.6Z" + android:fillColor="#B27AF4"/> + <path + android:pathData="M142.58,55.93C142.58,62.58 136.99,68 130.08,68C123.16,68 117.57,62.58 117.57,55.93C117.57,49.27 123.16,43.86 130.08,43.86C136.99,43.86 142.58,49.27 142.58,55.93Z" + android:strokeWidth="0.668769" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M139.9,55.93C139.9,61.15 135.51,65.4 130.08,65.4C124.64,65.4 120.25,61.15 120.25,55.93C120.25,50.71 124.64,46.46 130.08,46.46C135.51,46.46 139.9,50.71 139.9,55.93Z" + android:strokeWidth="0.668769" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M137.26,55.93C137.26,59.73 134.05,62.84 130.08,62.84C126.1,62.84 122.89,59.73 122.89,55.93C122.89,52.13 126.1,49.02 130.08,49.02C134.05,49.02 137.26,52.13 137.26,55.93Z" + android:strokeWidth="0.668769" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M134.87,55.93C134.87,58.47 132.73,60.54 130.08,60.54C127.42,60.54 125.29,58.47 125.29,55.93C125.29,53.39 127.42,51.31 130.08,51.31C132.73,51.31 134.87,53.39 134.87,55.93Z" + android:strokeWidth="0.668769" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M132.54,55.93C132.54,57.22 131.45,58.29 130.08,58.29C128.7,58.29 127.61,57.22 127.61,55.93C127.61,54.64 128.7,53.57 130.08,53.57C131.45,53.57 132.54,54.64 132.54,55.93Z" + android:strokeWidth="0.668769" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M133.71,35.21C133.23,35.77 132.63,36.59 132.55,37.92C130.66,42.59 129.83,48.47 129.83,54.62C129.83,60.77 130.95,66.47 132.85,71.14C131.95,71.36 131.02,71.51 130.06,71.57C121.13,71.24 114,64.55 114,56.35C114,50.58 117.53,45.56 122.74,42.97C124.91,41.77 127.56,40.29 127.65,38.85C127.74,37.37 127.33,36.27 126.95,35.46C126.79,35.13 127,34.72 127.35,34.69L133.32,34.25C133.71,34.22 133.97,34.66 133.8,35.02C133.77,35.08 133.74,35.14 133.71,35.21Z" + android:fillColor="#1F0333" + android:fillType="evenOdd"/> + <group> + <clip-path + android:pathData="M133.71,35.21C133.23,35.77 132.63,36.59 132.55,37.92C130.66,42.59 129.83,48.47 129.83,54.62C129.83,60.77 130.95,66.47 132.85,71.14C131.95,71.36 131.02,71.51 130.06,71.57C121.13,71.24 114,64.55 114,56.35C114,50.58 117.53,45.56 122.74,42.97C124.91,41.77 127.56,40.29 127.65,38.85C127.74,37.37 127.33,36.27 126.95,35.46C126.79,35.13 127,34.72 127.35,34.69L133.32,34.25C133.71,34.22 133.97,34.66 133.8,35.02C133.77,35.08 133.74,35.14 133.71,35.21Z" + android:fillType="evenOdd"/> + <path + android:pathData="M132.55,37.92L133.17,38.18L133.21,38.07L133.22,37.96L132.55,37.92ZM133.71,35.21L134.21,35.65L134.27,35.57L134.32,35.49L133.71,35.21ZM132.85,71.14L133.01,71.79L133.76,71.6L133.47,70.89L132.85,71.14ZM130.06,71.57L130.04,72.24L130.07,72.24L130.1,72.24L130.06,71.57ZM122.74,42.97L123.03,43.57L123.05,43.56L123.06,43.56L122.74,42.97ZM127.65,38.85L128.32,38.89L128.32,38.89L127.65,38.85ZM126.95,35.46L126.35,35.75L126.35,35.75L126.95,35.46ZM127.35,34.69L127.3,34.03L127.3,34.03L127.35,34.69ZM133.32,34.25L133.27,33.58L133.27,33.58L133.32,34.25ZM133.8,35.02L134.4,35.31L134.4,35.31L133.8,35.02ZM133.22,37.96C133.28,36.84 133.77,36.15 134.21,35.65L133.21,34.77C132.67,35.38 131.98,36.35 131.89,37.89L133.22,37.96ZM130.5,54.62C130.5,48.52 131.32,42.73 133.17,38.18L131.93,37.67C129.99,42.44 129.17,48.42 129.17,54.62H130.5ZM133.47,70.89C131.6,66.31 130.5,60.69 130.5,54.62H129.17C129.17,60.85 130.3,66.64 132.24,71.39L133.47,70.89ZM130.1,72.24C131.1,72.17 132.07,72.02 133.01,71.79L132.7,70.49C131.83,70.71 130.93,70.85 130.02,70.9L130.1,72.24ZM113.34,56.35C113.34,64.96 120.81,71.89 130.04,72.24L130.09,70.9C121.46,70.58 114.67,64.13 114.67,56.35H113.34ZM122.44,42.38C117.04,45.06 113.34,50.29 113.34,56.35H114.67C114.67,50.87 118.03,46.06 123.03,43.57L122.44,42.38ZM126.99,38.81C126.97,38.97 126.89,39.2 126.63,39.51C126.39,39.81 126.03,40.13 125.58,40.46C124.67,41.13 123.51,41.78 122.41,42.39L123.06,43.56C124.14,42.96 125.38,42.27 126.37,41.54C126.87,41.17 127.32,40.77 127.67,40.35C128.01,39.94 128.28,39.45 128.32,38.89L126.99,38.81ZM126.35,35.75C126.71,36.5 127.07,37.48 126.99,38.81L128.32,38.89C128.42,37.26 127.96,36.04 127.55,35.17L126.35,35.75ZM127.3,34.03C126.41,34.09 126.02,35.06 126.35,35.75L127.55,35.17C127.57,35.21 127.56,35.25 127.55,35.27C127.54,35.3 127.49,35.35 127.4,35.36L127.3,34.03ZM133.27,33.58L127.3,34.03L127.4,35.36L133.37,34.91L133.27,33.58ZM134.4,35.31C134.59,34.91 134.54,34.47 134.34,34.14C134.14,33.81 133.75,33.55 133.27,33.58L133.37,34.91C133.33,34.92 133.29,34.91 133.26,34.89C133.22,34.87 133.21,34.85 133.2,34.84C133.19,34.81 133.18,34.78 133.2,34.73L134.4,35.31ZM134.32,35.49C134.34,35.43 134.37,35.37 134.4,35.31L133.2,34.73C133.17,34.8 133.13,34.86 133.1,34.93L134.32,35.49Z" + android:fillColor="#B27AF4"/> + </group> + <path + android:pathData="M126.06,44.68C126.36,44.94 126.36,45.41 126.06,45.66L125.96,45.75C125.93,45.77 125.91,45.8 125.88,45.82L125.8,45.92C125.54,46.23 125.07,46.23 124.81,45.92L124.73,45.82C124.71,45.8 124.68,45.77 124.65,45.75L124.55,45.66C124.25,45.41 124.25,44.94 124.55,44.68L124.65,44.59C124.68,44.57 124.71,44.55 124.73,44.52L124.81,44.42C125.07,44.12 125.54,44.12 125.8,44.42L125.88,44.52C125.91,44.55 125.93,44.57 125.96,44.59L126.06,44.68Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M123.94,47.31C124.68,47.94 124.68,49.08 123.94,49.71L123.69,49.93C123.63,49.98 123.57,50.04 123.52,50.1L123.3,50.35C122.67,51.09 121.53,51.09 120.89,50.35L120.68,50.1C120.63,50.04 120.57,49.98 120.51,49.93L120.26,49.71C119.52,49.08 119.52,47.94 120.26,47.31L120.51,47.09C120.57,47.04 120.63,46.98 120.68,46.92L120.89,46.67C121.53,45.93 122.67,45.93 123.3,46.67L123.52,46.92C123.57,46.98 123.63,47.04 123.69,47.09L123.94,47.31Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M39.32,36.87L39.65,36.92C39.67,36.78 39.61,36.65 39.49,36.58C39.38,36.52 39.24,36.52 39.13,36.6L39.32,36.87ZM38.59,37.39L38.78,37.66L38.78,37.66L38.59,37.39ZM38.43,37.33L38.75,37.24L38.75,37.24L38.43,37.33ZM39.36,23.17L39.31,23.5C39.33,23.5 39.34,23.5 39.36,23.5L39.36,23.17ZM40.14,28.87L39.81,28.86C39.8,29.03 39.93,29.18 40.1,29.2C40.28,29.23 40.44,29.11 40.47,28.94L40.14,28.87ZM44.85,20.7L44.99,20.4C44.98,20.4 44.97,20.39 44.96,20.39L44.85,20.7ZM43.34,29.37L43.03,29.24C42.98,29.38 43.02,29.55 43.14,29.64C43.26,29.73 43.43,29.73 43.55,29.63L43.34,29.37ZM46.29,28.31L46.35,27.98L46.35,27.98L46.29,28.31ZM46.44,29.22L46.67,29.46L46.67,29.46L46.44,29.22ZM41.74,38.32L41.41,38.31L41.41,38.31L41.74,38.32ZM39.19,38.32L39.53,38.33L39.53,38.33L39.19,38.32ZM39.13,36.6L38.4,37.12L38.78,37.66L39.51,37.14L39.13,36.6ZM38.4,37.12C38.53,37.03 38.71,37.09 38.75,37.24L38.11,37.43C38.2,37.72 38.54,37.83 38.78,37.66L38.4,37.12ZM38.75,37.24C37.73,33.81 37.44,30.25 37.67,27.58C37.78,26.24 38.02,25.15 38.34,24.43C38.5,24.07 38.68,23.81 38.85,23.67C39.01,23.52 39.16,23.48 39.31,23.5L39.4,22.84C39.02,22.79 38.69,22.92 38.41,23.16C38.14,23.4 37.92,23.75 37.73,24.16C37.36,24.98 37.12,26.15 37,27.52C36.77,30.27 37.07,33.93 38.11,37.43L38.75,37.24ZM39.36,23.5C39.39,23.5 39.48,23.51 39.59,23.76C39.7,24.01 39.78,24.4 39.82,24.91C39.92,25.94 39.88,27.34 39.81,28.86L40.47,28.89C40.54,27.38 40.58,25.93 40.49,24.85C40.44,24.32 40.35,23.85 40.2,23.5C40.06,23.16 39.79,22.83 39.36,22.83L39.36,23.5ZM40.47,28.94C40.91,26.67 41.54,24.47 42.31,22.94C42.7,22.17 43.11,21.61 43.53,21.28C43.94,20.96 44.33,20.87 44.74,21.02L44.96,20.39C44.29,20.15 43.66,20.33 43.12,20.75C42.59,21.17 42.13,21.84 41.72,22.64C40.9,24.25 40.26,26.51 39.81,28.81L40.47,28.94ZM44.7,21C44.96,21.13 45.13,21.39 45.18,21.87C45.24,22.35 45.16,22.99 44.98,23.76C44.61,25.3 43.85,27.25 43.03,29.24L43.65,29.5C44.46,27.51 45.25,25.52 45.63,23.92C45.82,23.12 45.91,22.39 45.84,21.79C45.78,21.19 45.53,20.67 44.99,20.4L44.7,21ZM43.55,29.63C44.55,28.85 45.51,28.52 46.24,28.64L46.35,27.98C45.35,27.81 44.2,28.27 43.14,29.11L43.55,29.63ZM46.24,28.64C46.28,28.64 46.29,28.66 46.29,28.66C46.3,28.67 46.31,28.68 46.31,28.72C46.32,28.78 46.29,28.89 46.2,28.98L46.67,29.46C46.89,29.24 47.01,28.93 46.98,28.64C46.94,28.32 46.72,28.04 46.35,27.98L46.24,28.64ZM46.2,28.98C44.96,30.19 43.78,31.95 42.9,33.68C42.03,35.39 41.44,37.13 41.41,38.31L42.07,38.33C42.1,37.3 42.64,35.67 43.5,33.98C44.35,32.29 45.49,30.6 46.67,29.46L46.2,28.98ZM41.41,38.31C41.41,38.19 41.51,38.09 41.64,38.09V38.76C41.87,38.76 42.07,38.57 42.07,38.33L41.41,38.31ZM41.64,38.09H39.29V38.76H41.64V38.09ZM39.29,38.09C39.43,38.09 39.53,38.2 39.53,38.33L38.86,38.31C38.85,38.55 39.05,38.76 39.29,38.76V38.09ZM39.53,38.33C39.54,37.85 39.58,37.38 39.65,36.92L38.99,36.82C38.92,37.3 38.88,37.8 38.86,38.31L39.53,38.33Z" + android:fillColor="#F5F5F5"/> + <path + android:pathData="M36.46,40.58C35,41.63 31.5,43.57 29.93,44.4C36.88,44.41 49.4,43.73 47.91,43.1C45.51,42.09 43.92,41.2 43.01,39.96C41.99,38.57 38.29,39.25 36.46,40.58Z" + android:fillColor="#B27AF4"/> + <path + android:pathData="M36.22,40.71C36.85,40.01 38.08,38.64 38.01,37.22C37.96,36.31 37.84,35.68 37.71,35.27C37.68,35.16 37.88,34.98 37.98,35.04C39.02,35.74 40.04,36.41 42.09,36.43C42.15,36.43 42.27,36.85 42.27,36.91C42.22,38.2 42.8,40.01 43.68,40.78C44.13,41.17 42.88,41.29 41.2,41.27C49.88,41.91 56.71,48.56 56.71,56.67C56.71,65.2 49.15,72.12 39.83,72.12C30.51,72.12 22.95,65.2 22.95,56.67C22.95,48.2 30.4,41.32 39.63,41.22C38.39,41.16 37.12,41.06 36.21,40.95C36.13,40.94 36.1,40.85 36.15,40.79C36.18,40.76 36.2,40.74 36.22,40.71Z" + android:fillColor="#B27AF4"/> + <path + android:pathData="M53.82,56.44C53.82,63.36 47.73,69.02 40.17,69.02C32.6,69.02 26.51,63.36 26.51,56.44C26.51,49.52 32.6,43.87 40.17,43.87C47.73,43.87 53.82,49.52 53.82,56.44Z" + android:strokeWidth="0.667046" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M50.9,56.44C50.9,61.87 46.12,66.31 40.17,66.31C34.21,66.31 29.43,61.87 29.43,56.44C29.43,51.02 34.21,46.57 40.17,46.57C46.12,46.57 50.9,51.02 50.9,56.44Z" + android:strokeWidth="0.667046" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M48.02,56.44C48.02,60.39 44.53,63.65 40.17,63.65C35.8,63.65 32.31,60.39 32.31,56.44C32.31,52.49 35.8,49.24 40.17,49.24C44.53,49.24 48.02,52.49 48.02,56.44Z" + android:strokeWidth="0.667046" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M45.42,56.44C45.42,59.08 43.09,61.26 40.17,61.26C37.24,61.26 34.92,59.08 34.92,56.44C34.92,53.81 37.24,51.62 40.17,51.62C43.09,51.62 45.42,53.81 45.42,56.44Z" + android:strokeWidth="0.667046" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M42.89,56.44C42.89,57.78 41.7,58.92 40.17,58.92C38.64,58.92 37.45,57.78 37.45,56.44C37.45,55.1 38.64,53.97 40.17,53.97C41.7,53.97 42.89,55.1 42.89,56.44Z" + android:strokeWidth="0.667046" + android:fillColor="#00000000" + android:strokeColor="#1F0333"/> + <path + android:pathData="M42.34,38C42.29,38.01 42.24,38.03 42.19,38.04C40.18,42.83 39,48.68 39,54.99C39,61.32 40.19,67.17 42.2,71.97C41.24,72.2 40.25,72.35 39.23,72.42C29.76,72.07 22.2,65.2 22.2,56.78C22.2,50.85 25.95,45.69 31.47,43.03C33.77,41.79 36.98,39.92 36.89,38.55C36.82,37.38 36.35,36.14 35.94,35.31C35.77,34.97 35.99,34.55 36.37,34.52L42.7,34.07C43.11,34.04 43.39,34.49 43.21,34.86C42.75,35.78 42.28,37.02 42.34,38Z" + android:fillColor="#1F0333" + android:fillType="evenOdd"/> + <group> + <clip-path + android:pathData="M42.34,38C42.29,38.01 42.24,38.03 42.19,38.04C40.18,42.83 39,48.68 39,54.99C39,61.32 40.19,67.17 42.2,71.97C41.24,72.2 40.25,72.35 39.23,72.42C29.76,72.07 22.2,65.2 22.2,56.78C22.2,50.85 25.95,45.69 31.47,43.03C33.77,41.79 36.98,39.92 36.89,38.55C36.82,37.38 36.35,36.14 35.94,35.31C35.77,34.97 35.99,34.55 36.37,34.52L42.7,34.07C43.11,34.04 43.39,34.49 43.21,34.86C42.75,35.78 42.28,37.02 42.34,38Z" + android:fillType="evenOdd"/> + <path + android:pathData="M42.19,38.04L42,37.41L41.7,37.5L41.58,37.79L42.19,38.04ZM42.34,38L42.55,38.63L43.04,38.47L43.01,37.95L42.34,38ZM42.2,71.97L42.36,72.61L43.12,72.43L42.82,71.71L42.2,71.97ZM39.23,72.42L39.21,73.08L39.24,73.08L39.27,73.08L39.23,72.42ZM31.47,43.03L31.76,43.63L31.77,43.62L31.78,43.62L31.47,43.03ZM36.89,38.55L37.56,38.51L37.56,38.51L36.89,38.55ZM35.94,35.31L35.34,35.6L35.34,35.6L35.94,35.31ZM36.37,34.52L36.32,33.86L36.32,33.86L36.37,34.52ZM42.7,34.07L42.75,34.73L42.75,34.73L42.7,34.07ZM43.21,34.86L42.61,34.56L42.61,34.56L43.21,34.86ZM42.38,38.68C42.44,38.66 42.49,38.65 42.55,38.63L42.14,37.36C42.1,37.38 42.05,37.39 42,37.41L42.38,38.68ZM39.66,54.99C39.66,48.76 40.83,43 42.81,38.3L41.58,37.79C39.53,42.67 38.33,48.6 38.33,54.99H39.66ZM42.82,71.71C40.84,67 39.66,61.24 39.66,54.99H38.33C38.33,61.4 39.53,67.34 41.59,72.23L42.82,71.71ZM39.27,73.08C40.33,73.01 41.36,72.85 42.36,72.61L42.05,71.32C41.12,71.54 40.17,71.69 39.19,71.75L39.27,73.08ZM21.54,56.78C21.54,65.63 29.46,72.72 39.21,73.08L39.26,71.75C30.06,71.41 22.86,64.77 22.86,56.78H21.54ZM31.18,42.43C25.47,45.18 21.54,50.55 21.54,56.78H22.86C22.86,51.14 26.42,46.2 31.76,43.63L31.18,42.43ZM36.23,38.59C36.23,38.67 36.19,38.88 35.9,39.23C35.62,39.56 35.2,39.92 34.68,40.3C33.64,41.07 32.3,41.83 31.15,42.44L31.78,43.62C32.94,43 34.35,42.2 35.47,41.38C36.03,40.96 36.54,40.53 36.92,40.08C37.27,39.65 37.59,39.11 37.56,38.51L36.23,38.59ZM35.34,35.6C35.73,36.4 36.16,37.54 36.23,38.59L37.56,38.51C37.47,37.21 36.96,35.88 36.53,35.02L35.34,35.6ZM36.32,33.86C35.43,33.92 34.98,34.88 35.34,35.6L36.53,35.02C36.55,35.06 36.54,35.09 36.53,35.11C36.52,35.14 36.48,35.18 36.41,35.18L36.32,33.86ZM42.65,33.4L36.32,33.86L36.41,35.18L42.75,34.73L42.65,33.4ZM43.8,35.15C44.19,34.37 43.62,33.33 42.65,33.4L42.75,34.73C42.72,34.73 42.69,34.72 42.66,34.71C42.63,34.7 42.62,34.68 42.61,34.67C42.6,34.65 42.59,34.61 42.61,34.56L43.8,35.15ZM43.01,37.95C42.96,37.17 43.35,36.07 43.8,35.15L42.61,34.56C42.14,35.5 41.61,36.88 41.68,38.04L43.01,37.95Z" + android:fillColor="#B27AF4"/> + </group> + <path + android:pathData="M32.73,48.33C32.63,48.4 32.53,48.47 32.43,48.55C32.02,48.85 31.63,49.17 31.26,49.5C31.22,49.54 31.17,49.58 31.12,49.61C30.61,49.97 29.9,49.96 29.44,49.52C28.93,49.04 28.91,48.24 29.42,47.77C29.47,47.72 29.52,47.68 29.57,47.63C29.99,47.25 30.43,46.89 30.88,46.56C31.02,46.45 31.17,46.34 31.32,46.23C31.79,45.91 32.26,45.61 32.75,45.32C32.79,45.3 32.83,45.28 32.87,45.26C32.89,45.25 32.91,45.24 32.93,45.23C33.54,44.89 34.29,45.16 34.59,45.79C34.86,46.37 34.65,47.04 34.15,47.42C34.11,47.45 34.06,47.48 34.01,47.51C33.57,47.76 33.14,48.03 32.73,48.33Z" + android:fillColor="#F9F9F9"/> + <path + android:pathData="M24.9,50.74a1.27,1.27 46.59,1 0,2.54 0.07a1.27,1.27 46.59,1 0,-2.54 -0.07z" + android:fillColor="#F9F9F9"/> +</vector> ===================================== fenix/app/src/main/res/font/roboto_bold.ttf ===================================== Binary files /dev/null and b/fenix/app/src/main/res/font/roboto_bold.ttf differ ===================================== fenix/app/src/main/res/font/roboto_regular.ttf ===================================== Binary files /dev/null and b/fenix/app/src/main/res/font/roboto_regular.ttf differ ===================================== fenix/app/src/main/res/layout/fragment_home.xml ===================================== @@ -107,24 +107,153 @@ </com.google.android.material.appbar.CollapsingToolbarLayout> - <TextView - android:id="@+id/exploreprivately" - android:layout_width="wrap_content" + </com.google.android.material.appbar.AppBarLayout> + + <androidx.core.widget.NestedScrollView + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layout_behavior="@string/appbar_scrolling_view_behavior" + android:paddingBottom="56dp">  + + <LinearLayout + android:id="@+id/yec_popup" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center|center_vertical" - android:gravity="center_horizontal" - android:clickable="false" - android:ellipsize="end" - android:focusable="false" - android:importantForAccessibility="no" - android:text="@string/tor_explore_privately" - android:fontFamily="Roboto-Medium" - android:textColor="#DEFFFFFF" - android:textSize="40sp" - android:lineSpacingMultiplier="1.1" - app:layout_scrollFlags="scroll" /> - - </com.google.android.material.appbar.AppBarLayout> + android:layout_marginTop="20dp" + android:layout_marginStart="15dp" + android:layout_marginEnd="15dp" + android:paddingStart="30dp" + android:paddingEnd="30dp" + android:paddingTop="30dp" + android:paddingBottom="30dp" + android:layout_weight="1" + android:orientation="vertical" + style="@style/YecPopup" > + + <ImageView + android:id="@+id/yec_close" + android:layout_height="30dp" + android:layout_width="30dp" + android:layout_gravity="end" + app:srcCompat="@drawable/ic_close" + tools:ignore="ContentDescription" /> + + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="40dp" + android:layout_marginEnd="40dp" + android:paddingTop="10dp"> + +  + <ImageView + android:id="@+id/yec_illustration" + android:layout_width="0dp" + android:layout_height="wrap_content" + + app:layout_constraintWidth_min="40dp" + app:layout_constraintWidth_max="320dp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + android:layout_gravity="center_horizontal" + + android:adjustViewBounds="true" + app:layout_scrollFlags="scroll" + app:srcCompat="@drawable/yec_illustration_android" + tools:ignore="ContentDescription" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + + <TextView + android:id="@+id/yec_intro_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clickable="false" + android:focusable="false" + android:importantForAccessibility="no" + android:layout_marginTop="15dp" + android:text="@string/yec_2023_introduction" + android:textColor="#FBFBFE" + android:textSize="18sp" + android:lineSpacingExtra="5dp" + android:fontFamily="Roboto-Bold" + android:textStyle="bold" + app:layout_scrollFlags="scroll" /> + + <TextView + android:id="@+id/yec_please_donate_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clickable="false" + android:focusable="false" + android:importantForAccessibility="no" + android:layout_marginTop="15dp" + android:text="@string/yec_2023_please_donate" + android:textColor="#FBFBFE" + android:textSize="16sp" + android:lineSpacingExtra="5dp" + android:fontFamily="Roboto-Medium" + app:layout_scrollFlags="scroll" /> + + <Button + android:id="@+id/donate_now_button" + style="@style/TorDonateYecButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginTop="30dp" + android:background="@drawable/tor_yec_donate_rounded_corners" + android:drawableEnd="@drawable/yec_heart" + android:drawablePadding="10dp" + android:paddingEnd="15dp" + android:paddingStart="15dp" + android:text="@string/yec_2023_donate_button" + android:textAllCaps="false" + android:textColor="#1F0333" + android:textSize="18sp" + android:textStyle="bold" + android:fontFamily="Roboto-Bold" + android:visibility="visible" + tools:ignore="ButtonStyleXmlDetector" /> + + <TextView + android:id="@+id/yec_free_to_use" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:clickable="false" + android:focusable="false" + android:importantForAccessibility="no" + android:layout_marginTop="30dp" + android:text="@string/yec_2023_free_to_use" + android:textColor="#FBFBFE" + android:textSize="16sp" + android:lineSpacingExtra="5dp" + android:fontFamily="Roboto-Medium" + app:layout_scrollFlags="scroll" /> + + </LinearLayout> + </androidx.core.widget.NestedScrollView> + + <TextView + android:id="@+id/exploreprivately" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center|center_vertical" + android:gravity="center_horizontal" + android:clickable="false" + android:ellipsize="end" + android:focusable="false" + android:importantForAccessibility="no" + android:text="@string/tor_explore_privately" + android:fontFamily="Roboto-Medium" + android:textColor="#DEFFFFFF" + android:textSize="40sp" + android:lineSpacingMultiplier="1.1" + app:layout_scrollFlags="scroll" /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/sessionControlRecyclerView" @@ -137,7 +266,6 @@ android:transitionGroup="false" android:importantForAccessibility="yes" android:overScrollMode="never" - tools:listitem="@layout/collection_home_list_row" tools:itemCount="3" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"/> ===================================== fenix/app/src/main/res/values/colors.xml ===================================== @@ -274,6 +274,7 @@ <color name="onboarding_illustration_deselected_private_theme">#99FBFBFE</color> <color name="prompt_login_edit_text_cursor_color_private_theme">@color/photonViolet50</color> + <color name="tor_yec_home_background">#1F0333</color>  <color name="accent_normal_theme">@color/photonInk20</color> <color name="accent_high_contrast_normal_theme">@color/photonInk20</color> ===================================== fenix/app/src/main/res/values/styles.xml ===================================== @@ -336,6 +336,17 @@ <style name="PrivateTheme" parent="PrivateThemeBase" /> + <style name="PrivateEOYTheme" parent="PrivateThemeBase" > + <item name="android:windowBackground">@color/tor_yec_home_background</item> + <item name="homeBackground">@color/tor_yec_home_background</item> + </style> + + <style name="YecPopup" > + <item name="homeBackground">@color/tor_yec_home_background</item> + <item name="android:background">@drawable/tor_yec_popup_rounded_corners</item> + </style> + +  <style name="WindowAnimationTransition"> <item name="android:windowEnterAnimation">@anim/fade_in</item> @@ -375,6 +386,21 @@ <item name="android:textColor">?attr/textPrimary</item> </style> + <style name="TorDonateYecButton" parent="NeutralButton"> + <item name="android:background">@drawable/tor_yec_donate_rounded_corners</item> + <item name="backgroundTint">#FFBD4F</item> + <item name="android:textColor">#1F0333</item> + <item name="android:fontFamily">Roboto-Bold</item> + <item name="fontFamily">Roboto-Bold</item> + </style> + + <style name="TorDonateYecButtonText" parent="Base.TextAppearance.MaterialComponents.Badge"> + + <item name="android:textStyle">bold</item> + <item name="android:textColor">#000000</item> + </style> + + <style name="DestructiveButton" parent="NeutralButton"> <item name="iconTint">@color/fx_mobile_icon_color_warning_button</item> <item name="android:textColor">@color/fx_mobile_text_color_warning_button</item> View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/5b5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/5b5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40974: Fix firefox-android with the release target.
by richard (＠richard) 11 Oct '23

11 Oct '23

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: bf0dfe66 by Pier Angelo Vendrame at 2023-10-11T09:51:01+02:00 Bug 40974: Fix firefox-android with the release target. In the firefox-android project we look for the geckoview artifacts to detect its version. For alpha and nightly its directory incldues the channel, so we were looking for `geckoview-release-omni`, but for release the directory is `geckoview-omni` only. - - - - - 1 changed file: - projects/firefox-android/build Changes: ===================================== projects/firefox-android/build ===================================== @@ -53,7 +53,12 @@ cd $builddir-[% c('version') %] patch -p1 < $rootdir/repos.diff sed -i 's|^$val VERSION = $.*|\1"[% c("var/as_version") %]"|' android-components/plugins/dependencies/src/main/java/ApplicationServices.kt sed -i 's|^$val CHANNEL = $.*|\1ApplicationServicesChannel.RELEASE|' android-components/plugins/dependencies/src/main/java/ApplicationServices.kt -gv_version=$(find "$distdir/geckoview/org/mozilla/geckoview/geckoview-[% c('var/variant') FILTER lower %]-omni" -mindepth 1 -maxdepth 1 -type d -printf '%f\n') +[% IF c("var/channel") == "release" -%] + gv_dir="$distdir/geckoview/org/mozilla/geckoview/geckoview-omni" +[% ELSE -%] + gv_dir="$distdir/geckoview/org/mozilla/geckoview/geckoview-[% c('var/variant') FILTER lower %]-omni" +[% END -%] +gv_version=$(find "$gv_dir" -mindepth 1 -maxdepth 1 -type d -printf '%f\n') sed -i "s|$\s*const val version = $.*|\1\"$gv_version\"|" android-components/plugins/dependencies/src/main/java/Gecko.kt sed -i 's|$\s*val channel = $.*|\1GeckoChannel.[% c("var/variant") FILTER upper %]|' android-components/plugins/dependencies/src/main/java/Gecko.kt View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Modify UI/UX
by Dan Ballard (＠dan) 11 Oct '23

11 Oct '23

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: 12888889 by clairehurst at 2023-10-10T17:03:22-06:00 fixup! Modify UI/UX Bug 42165: Remove "Add to shortcuts" and "Remove from shortcuts" buttons - - - - - 1 changed file: - fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt ===================================== @@ -373,12 +373,12 @@ open class DefaultToolbarMenu( findInPageItem, desktopSiteItem, customizeReaderView.apply { visible = ::shouldShowReaderViewCustomization }, -// openInApp.apply { visible = ::shouldShowOpenInApp }, - //reportSiteIssuePlaceholder, + // openInApp.apply { visible = ::sho uldShowOpenInApp }, + // reportSiteIssuePlaceholder, BrowserMenuDivider(), // addToHomeScreenItem.apply { visible = ::canAddToHomescreen }, // installToHomescreen.apply { visible = ::canInstall }, - addRemoveTopSitesItem, + // addRemoveTopSitesItem, // saveToCollectionItem, BrowserMenuDivider(), settingsItem, View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/128… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/128… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.3.1esr-13.0-1] fixup! Bug 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (＠pierov) 11 Oct '23

11 Oct '23

Pier Angelo Vendrame pushed to branch tor-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 53eec1f2 by Pier Angelo Vendrame at 2023-10-11T18:25:34+00:00 fixup! Bug 40933: Add tor-launcher functionality Bug 42160: Allow specifying a TOR_PROVIDER=none to configure only the proxy settings during the TorProviderBuilder initialization. - - - - - 2 changed files: - toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs - toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs Changes: ===================================== toolkit/components/tor-launcher/TorLauncherUtil.sys.mjs ===================================== @@ -644,6 +644,7 @@ export const TorLauncherUtil = Object.freeze({ try { const kBrowserToolboxPort = "MOZ_BROWSER_TOOLBOX_PORT"; const kEnvSkipLaunch = "TOR_SKIP_LAUNCH"; + const kEnvProvider = "TOR_PROVIDER"; if (Services.env.exists(kBrowserToolboxPort)) { return false; } @@ -651,6 +652,12 @@ export const TorLauncherUtil = Object.freeze({ const value = parseInt(Services.env.get(kEnvSkipLaunch)); return isNaN(value) || !value; } + if ( + Services.env.exists(kEnvProvider) && + Services.env.get(kEnvProvider) === "none" + ) { + return false; + } } catch (e) {} return Services.prefs.getBoolPref(kPrefStartTor, true); }, ===================================== toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs ===================================== @@ -18,6 +18,11 @@ export const TorProviderTopics = Object.freeze({ StreamSucceeded: "TorStreamSucceeded", }); +export const TorProviders = Object.freeze({ + none: 0, + tor: 1, +}); + /** * The factory to get a Tor provider. * Currently we support only TorProvider, i.e., the one that interacts with @@ -35,9 +40,9 @@ export class TorProviderBuilder { * The observer that checks when the tor process exits, and reinitializes the * provider. * - * @type {nsIObserver?} + * @type {Function} */ - static #observer = null; + static #exitObserver = null; /** * Tell whether the browser UI is ready. @@ -54,25 +59,30 @@ export class TorProviderBuilder { * initialization anyway (and re-throw any initialization error). */ static async init() { - this.#observer = { - observe(subject, topic, data) { - if (topic !== TorProviderTopics.ProcessExited) { - return; - } - if (!TorProviderBuilder.#uiReady) { - console.warn( - `Seen ${TorProviderTopics.ProcessExited}, but not doing anything because the UI is not ready yet.` - ); - return; - } - TorProviderBuilder.#torExited(); - }, - }; - Services.obs.addObserver(this.#observer, TorProviderTopics.ProcessExited); - await this.#initProvider(); + switch (this.providerType) { + case TorProviders.tor: + await this.#initTorProvider(); + break; + case TorProviders.none: + lazy.TorLauncherUtil.setProxyConfiguration( + lazy.TorLauncherUtil.getPreferredSocksConfiguration() + ); + break; + default: + console.error(`Unknown tor provider ${this.providerType}.`); + break; + } } - static async #initProvider() { + static async #initTorProvider() { + if (!this.#exitObserver) { + this.#exitObserver = this.#torExited.bind(this); + Services.obs.addObserver( + this.#exitObserver, + TorProviderTopics.ProcessExited + ); + } + try { const old = await this.#provider; old?.uninit(); @@ -92,12 +102,12 @@ export class TorProviderBuilder { provider.uninit(); this.#provider = null; }); - if (this.#observer) { + if (this.#exitObserver) { Services.obs.removeObserver( - this.#observer, + this.#exitObserver, TorProviderTopics.ProcessExited ); - this.#observer = null; + this.#exitObserver = null; } } @@ -107,7 +117,11 @@ export class TorProviderBuilder { * catch also any initialization errors. */ static async build() { - if (!this.#provider) { + if (!this.#provider && this.providerType === TorProviders.none) { + throw new Error( + "Tor Browser has been configured to use only the proxy functionalities." + ); + } else if (!this.#provider) { throw new Error( "The provider has not been initialized or already uninitialized." ); @@ -125,7 +139,10 @@ export class TorProviderBuilder { */ static async firstWindowLoaded() { // FIXME: Just integrate this with the about:torconnect or about:tor UI. - if (!lazy.TorLauncherUtil.shouldStartAndOwnTor) { + if ( + !lazy.TorLauncherUtil.shouldStartAndOwnTor || + this.providerType !== TorProviders.tor + ) { // If we are not managing the Tor daemon we cannot restart it, so just // early return. return; @@ -143,7 +160,7 @@ export class TorProviderBuilder { } while (!running && lazy.TorLauncherUtil.showRestartPrompt(true)) { try { - await this.#initProvider(); + await this.#initTorProvider(); running = true; } catch {} } @@ -153,11 +170,40 @@ export class TorProviderBuilder { } static async #torExited() { + if (!this.#uiReady) { + console.warn( + `Seen ${TorProviderTopics.ProcessExited}, but not doing anything because the UI is not ready yet.` + ); + return; + } while (lazy.TorLauncherUtil.showRestartPrompt(false)) { try { - await this.#initProvider(); + await this.#initTorProvider(); break; } catch {} } } + + /** + * Return the provider chosen by the user. + * This function checks the TOR_PROVIDER environment variable and if it is a + * known provider, it returns its associated value. + * Otherwise, if it is not valid, the C tor implementation is chosen as the + * default one. + * + * @returns {number} An entry from TorProviders + */ + static get providerType() { + // TODO: Add a preference to permanently save this without and avoid always + // using an environment variable. + let provider = TorProviders.tor; + const kEnvName = "TOR_PROVIDER"; + if ( + Services.env.exists(kEnvName) && + Services.env.get(kEnvName) in TorProviders + ) { + provider = TorProviders[Services.env.get(kEnvName)]; + } + return provider; + } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/53eec1f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/53eec1f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.3.1esr-13.0-1] fixup! Bug 41454: Move focus after calling openPreferences for a sub-category.
by richard (＠richard) 11 Oct '23

11 Oct '23

richard pushed to branch mullvad-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 88e111c6 by Henry Wilkes at 2023-10-11T18:31:30+00:00 fixup! Bug 41454: Move focus after calling openPreferences for a sub-category. Bug 42167: Make the auto-focus more reliable. No longer use the setTimeout to wait a loop, but instead wait for the "load" event. - - - - - 1 changed file: - browser/components/preferences/preferences.js Changes: ===================================== browser/components/preferences/preferences.js ===================================== @@ -482,14 +482,23 @@ async function scrollAndHighlight(subcategory, category) { // We assign a tabindex=-1 to the element so that we can focus it. This allows // us to move screen reader's focus to an arbitrary position on the page. - // See tor-browser#41454 and bug 1799153. - element.setAttribute("tabindex", "-1"); - // The element is not always immediately focusable, so we wait until the next - // loop. - setTimeout(() => { + // See tor-browser#41454 and mozilla bug 1799153. + const doFocus = () => { + element.setAttribute("tabindex", "-1"); Services.focus.setFocus(element, Services.focus.FLAG_NOSCROLL); + // Immediately remove again now that it has focus. element.removeAttribute("tabindex"); - }); + }; + // The element is not always immediately focusable, so we wait until document + // load. + if (document.readyState === "complete") { + doFocus(); + } else { + // Wait until document load to move focus. + // NOTE: This should be called after DOMContentLoaded, where the searchInput + // is focused. + window.addEventListener("load", doFocus, { once: true }); + } scrollContentTo(header); element.classList.add("spotlight"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/88e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/88e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.3.1esr-13.0-1] fixup! Bug 41454: Move focus after calling openPreferences for a sub-category.
by richard (＠richard) 11 Oct '23

11 Oct '23

richard pushed to branch base-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 3d78c742 by Henry Wilkes at 2023-10-11T18:30:21+00:00 fixup! Bug 41454: Move focus after calling openPreferences for a sub-category. Bug 42167: Make the auto-focus more reliable. No longer use the setTimeout to wait a loop, but instead wait for the "load" event. - - - - - 1 changed file: - browser/components/preferences/preferences.js Changes: ===================================== browser/components/preferences/preferences.js ===================================== @@ -482,14 +482,23 @@ async function scrollAndHighlight(subcategory, category) { // We assign a tabindex=-1 to the element so that we can focus it. This allows // us to move screen reader's focus to an arbitrary position on the page. - // See tor-browser#41454 and bug 1799153. - element.setAttribute("tabindex", "-1"); - // The element is not always immediately focusable, so we wait until the next - // loop. - setTimeout(() => { + // See tor-browser#41454 and mozilla bug 1799153. + const doFocus = () => { + element.setAttribute("tabindex", "-1"); Services.focus.setFocus(element, Services.focus.FLAG_NOSCROLL); + // Immediately remove again now that it has focus. element.removeAttribute("tabindex"); - }); + }; + // The element is not always immediately focusable, so we wait until document + // load. + if (document.readyState === "complete") { + doFocus(); + } else { + // Wait until document load to move focus. + // NOTE: This should be called after DOMContentLoaded, where the searchInput + // is focused. + window.addEventListener("load", doFocus, { once: true }); + } scrollContentTo(header); element.classList.add("spotlight"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3d78c74… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3d78c74… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.3.1esr-13.0-1] fixup! Bug 40926: Implemented the New Identity feature
by richard (＠richard) 11 Oct '23

11 Oct '23

richard pushed to branch mullvad-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: fae8c72e by Henry Wilkes at 2023-10-11T18:11:29+00:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42166: Give new identity dialog an accessible name. - - - - - 1 changed file: - browser/components/newidentity/content/newIdentityDialog.xhtml Changes: ===================================== browser/components/newidentity/content/newIdentityDialog.xhtml ===================================== @@ -16,6 +16,7 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + aria-labelledby="infoTitle" aria-describedby="infoBody" > <dialog id="newIdentityDialog" buttons="accept,cancel" defaultButton="accept"> View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/fae… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/fae… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.3.1esr-13.0-1] fixup! Bug 40926: Implemented the New Identity feature
by richard (＠richard) 11 Oct '23

11 Oct '23

richard pushed to branch base-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 5c5e5ffb by Henry Wilkes at 2023-10-11T18:10:08+00:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42166: Give new identity dialog an accessible name. - - - - - 1 changed file: - browser/components/newidentity/content/newIdentityDialog.xhtml Changes: ===================================== browser/components/newidentity/content/newIdentityDialog.xhtml ===================================== @@ -16,6 +16,7 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + aria-labelledby="infoTitle" aria-describedby="infoBody" > <dialog id="newIdentityDialog" buttons="accept,cancel" defaultButton="accept"> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5c5e5ff… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5c5e5ff… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.3.1esr-13.0-1] fixup! Bug 41454: Move focus after calling openPreferences for a sub-category.
by Pier Angelo Vendrame (＠pierov) 11 Oct '23

11 Oct '23

Pier Angelo Vendrame pushed to branch tor-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 00e9622f by Henry Wilkes at 2023-10-11T11:24:18+01:00 fixup! Bug 41454: Move focus after calling openPreferences for a sub-category. Bug 42167: Make the auto-focus more reliable. No longer use the setTimeout to wait a loop, but instead wait for the "load" event. - - - - - 1 changed file: - browser/components/preferences/preferences.js Changes: ===================================== browser/components/preferences/preferences.js ===================================== @@ -491,14 +491,23 @@ async function scrollAndHighlight(subcategory, category) { // We assign a tabindex=-1 to the element so that we can focus it. This allows // us to move screen reader's focus to an arbitrary position on the page. - // See tor-browser#41454 and bug 1799153. - element.setAttribute("tabindex", "-1"); - // The element is not always immediately focusable, so we wait until the next - // loop. - setTimeout(() => { + // See tor-browser#41454 and mozilla bug 1799153. + const doFocus = () => { + element.setAttribute("tabindex", "-1"); Services.focus.setFocus(element, Services.focus.FLAG_NOSCROLL); + // Immediately remove again now that it has focus. element.removeAttribute("tabindex"); - }); + }; + // The element is not always immediately focusable, so we wait until document + // load. + if (document.readyState === "complete") { + doFocus(); + } else { + // Wait until document load to move focus. + // NOTE: This should be called after DOMContentLoaded, where the searchInput + // is focused. + window.addEventListener("load", doFocus, { once: true }); + } scrollContentTo(header); element.classList.add("spotlight"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/00e9622… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/00e9622… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.3.1esr-13.0-1] fixup! Bug 40926: Implemented the New Identity feature
by Pier Angelo Vendrame (＠pierov) 11 Oct '23

11 Oct '23

Pier Angelo Vendrame pushed to branch tor-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 6d62dc70 by Henry Wilkes at 2023-10-11T10:18:26+01:00 fixup! Bug 40926: Implemented the New Identity feature Bug 42166: Give new identity dialog an accessible name. - - - - - 1 changed file: - browser/components/newidentity/content/newIdentityDialog.xhtml Changes: ===================================== browser/components/newidentity/content/newIdentityDialog.xhtml ===================================== @@ -16,6 +16,7 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + aria-labelledby="infoTitle" aria-describedby="infoBody" > <dialog id="newIdentityDialog" buttons="accept,cancel" defaultButton="accept"> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6d62dc7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6d62dc7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Modify UI/UX
by Dan Ballard (＠dan) 10 Oct '23

10 Oct '23

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: 2854981a by clairehurst at 2023-10-10T18:46:34+00:00 fixup! Modify UI/UX Bug 42158: Remove Customize Homepage button - - - - - 4 changed files: - fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt - fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt - fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - fenix/app/src/main/res/xml/preferences.xml Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt ===================================== @@ -56,7 +56,7 @@ class HomeMenu( object ManageAccountAndDevices : Item() object WhatsNew : Item() object Help : Item() - object CustomizeHome : Item() +// object CustomizeHome : Item() object Settings : Item() object Quit : Item() object ReconnectSync : Item() @@ -175,13 +175,13 @@ class HomeMenu( onItemTapped.invoke(Item.Help) } - val customizeHomeItem = BrowserMenuImageText( - context.getString(R.string.browser_menu_customize_home_1), - R.drawable.ic_customize, - primaryTextColor, - ) { - onItemTapped.invoke(Item.CustomizeHome) - } +// val customizeHomeItem = BrowserMenuImageText( +// context.getString(R.string.browser_menu_customize_home_1), +// R.drawable.ic_customize, +// primaryTextColor, +// ) { +// onItemTapped.invoke(Item.CustomizeHome) +// } // Use nimbus to set the icon and title. // val nimbusValidation = FxNimbus.features.nimbusValidation.value() @@ -217,7 +217,7 @@ class HomeMenu( BrowserMenuDivider(), whatsNewItem, helpItem, - customizeHomeItem, +// customizeHomeItem, settingsItem, quitItem ).also { items -> ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt ===================================== @@ -103,14 +103,14 @@ class HomeMenuView( HomeFragmentDirections.actionGlobalSettingsFragment(), ) } - HomeMenu.Item.CustomizeHome -> { - HomeScreen.customizeHomeClicked.record(NoExtras()) - - navController.nav( - R.id.homeFragment, - HomeFragmentDirections.actionGlobalHomeSettingsFragment(), - ) - } +// HomeMenu.Item.CustomizeHome -> { +// HomeScreen.customizeHomeClicked.record(NoExtras()) +// +// navController.nav( +// R.id.homeFragment, +// HomeFragmentDirections.actionGlobalHomeSettingsFragment(), +// ) +// } is HomeMenu.Item.SyncAccount -> { navController.nav( R.id.homeFragment, ===================================== fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt ===================================== @@ -271,9 +271,9 @@ class SettingsFragment : PreferenceFragmentCompat() { resources.getString(R.string.pref_key_tabs) -> { SettingsFragmentDirections.actionSettingsFragmentToTabsSettingsFragment() } - resources.getString(R.string.pref_key_home) -> { - SettingsFragmentDirections.actionSettingsFragmentToHomeSettingsFragment() - } +// resources.getString(R.string.pref_key_home) -> { +// SettingsFragmentDirections.actionSettingsFragmentToHomeSettingsFragment() +// } resources.getString(R.string.pref_key_search_settings) -> { SettingsFragmentDirections.actionSettingsFragmentToSearchEngineFragment() } @@ -674,19 +674,19 @@ class SettingsFragment : PreferenceFragmentCompat() { @VisibleForTesting internal fun setupHomepagePreference() { - with(requirePreference<Preference>(R.string.pref_key_home)) { - summary = context?.let { - when { - it.settings().alwaysOpenTheHomepageWhenOpeningTheApp -> - getString(R.string.opening_screen_homepage_summary) - it.settings().openHomepageAfterFourHoursOfInactivity -> - getString(R.string.opening_screen_after_four_hours_of_inactivity_summary) - it.settings().alwaysOpenTheLastTabWhenOpeningTheApp -> - getString(R.string.opening_screen_last_tab_summary) - else -> null - } - } - } +// with(requirePreference<Preference>(R.string.pref_key_home)) { +// summary = context?.let { +// when { +// it.settings().alwaysOpenTheHomepageWhenOpeningTheApp -> +// getString(R.string.opening_screen_homepage_summary) +// it.settings().openHomepageAfterFourHoursOfInactivity -> +// getString(R.string.opening_screen_after_four_hours_of_inactivity_summary) +// it.settings().alwaysOpenTheLastTabWhenOpeningTheApp -> +// getString(R.string.opening_screen_last_tab_summary) +// else -> null +// } +// } +// } } @VisibleForTesting ===================================== fenix/app/src/main/res/xml/preferences.xml ===================================== @@ -54,10 +54,10 @@ android:key="@string/pref_key_tabs" android:title="@string/preferences_tabs" /> - <androidx.preference.Preference - app:iconSpaceReserved="false" - android:key="@string/pref_key_home" - android:title="@string/preferences_home_2" /> + + + + <androidx.preference.Preference android:key="@string/pref_key_customize" View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/285… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/285… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.3.1esr-13.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by richard (＠richard) 10 Oct '23

10 Oct '23

richard pushed to branch tor-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: c02fa5a8 by hackademix at 2023-10-10T16:58:37+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41766: Sanitize about:torconnect redirects. - - - - - 1 changed file: - browser/components/torconnect/content/aboutTorConnect.js Changes: ===================================== browser/components/torconnect/content/aboutTorConnect.js ===================================== @@ -822,15 +822,21 @@ class AboutTorConnect { } async init() { + // if the user gets here manually or via the button in the urlbar + // then we will redirect to about:tor + this.redirect = "about:tor"; + // see if a user has a final destination after bootstrapping let params = new URLSearchParams(new URL(document.location.href).search); if (params.has("redirect")) { - const encodedRedirect = params.get("redirect"); - this.redirect = decodeURIComponent(encodedRedirect); - } else { - // if the user gets here manually or via the button in the urlbar - // then we will redirect to about:tor - this.redirect = "about:tor"; + try { + const redirect = new URL(decodeURIComponent(params.get("redirect"))); + if (/^(?:https?|about):$/.test(redirect.protocol)) { + this.redirect = redirect.href; + } + } catch (e) { + console.error(e, `Invalid redirect URL "${params.get("redirect")}"!`); + } } let args = await RPMSendQuery("torconnect:get-init-args"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c02fa5a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c02fa5a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Modify UI/UX
by Dan Ballard (＠dan) 10 Oct '23

10 Oct '23

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: 1d53ad16 by clairehurst at 2023-10-10T16:18:31+00:00 fixup! Modify UI/UX Bug 42157: Fix Help button URL - - - - - 1 changed file: - fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt ===================================== @@ -160,10 +160,7 @@ class HomeMenuView( } HomeMenu.Item.Help -> { homeActivity.openToBrowserAndLoad( - searchTermOrURL = SupportUtils.getSumoURLForTopic( - context = context, - topic = SupportUtils.SumoTopic.HELP, - ), + searchTermOrURL = SupportUtils.getTorHelpPageUrl(), newTab = true, from = BrowserDirection.FromHome, ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/1d5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/1d5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.0-1] fixup! Modify UI/UX
by Dan Ballard (＠dan) 10 Oct '23

10 Oct '23

Dan Ballard pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: 3b34325f by clairehurst at 2023-10-05T17:45:17-06:00 fixup! Modify UI/UX Bug 42156: Screenshot allowing still blocks homescreen (android) - - - - - 1 changed file: - fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt Changes: ===================================== fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt ===================================== @@ -14,6 +14,7 @@ import android.os.Bundle import android.os.Handler import android.os.Looper import android.view.LayoutInflater +import android.view.WindowManager import android.widget.Toast import androidx.annotation.VisibleForTesting import androidx.appcompat.app.AlertDialog @@ -471,7 +472,16 @@ class SettingsFragment : PreferenceFragmentCompat() { requirePreference<DefaultBrowserPreference>(R.string.pref_key_make_default_browser) requirePreference<Preference>(R.string.pref_key_allow_screenshots_in_private_mode).apply { - onPreferenceChangeListener = SharedPreferenceUpdater() + onPreferenceChangeListener = object : SharedPreferenceUpdater() { + override fun onPreferenceChange(preference: Preference, newValue: Any?): Boolean { + if (newValue == false) { + activity?.window?.addFlags(WindowManager.LayoutParams.FLAG_SECURE) + } else { + activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE) + } + return super.onPreferenceChange(preference, newValue) + } + } } preferencePrioritizeOnions?.setOnPreferenceChangeListener<Boolean> { preference, newValue -> View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/3b3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/3b3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android] Deleted branch bug_42074
by Dan Ballard (＠dan) 10 Oct '23

10 Oct '23

Dan Ballard deleted branch bug_42074 at The Tor Project / Applications / firefox-android -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android] Pushed new branch bug_42074
by Dan Ballard (＠dan) 10 Oct '23

10 Oct '23

Dan Ballard pushed new branch bug_42074 at The Tor Project / Applications / firefox-android -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/tree/bug_4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.3.1esr-13.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by Pier Angelo Vendrame (＠pierov) 10 Oct '23

10 Oct '23

Pier Angelo Vendrame pushed to branch tor-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: e7f56e07 by Pier Angelo Vendrame at 2023-10-10T14:50:51+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41976: Fix the padding of the collapsed bridge cards. - - - - - 1 changed file: - browser/components/torpreferences/content/torPreferences.css Changes: ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -298,13 +298,13 @@ 'bridge-qr bridge-share bridge-share' 'bridge-qr bridge-address bridge-address' 'bridge-qr bridge-learn-more bridge-copy'; - padding-top: 12px; visibility: hidden; } .expanded .torPreferences-bridgeCard-grid, .currently-connected .torPreferences-bridgeCard-grid, .single-card .torPreferences-bridgeCard-grid { + padding-top: 12px; visibility: visible; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e7f56e0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e7f56e0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.3.1esr-13.0-1] fixup! Bug 40925: Implemented the Security Level component
by Pier Angelo Vendrame (＠pierov) 10 Oct '23

10 Oct '23

Pier Angelo Vendrame pushed to branch mullvad-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 70edc71a by Henry Wilkes at 2023-10-10T12:46:04+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 41973: re-align popup panel to the anchor's corner edge. - - - - - 1 changed file: - browser/components/securitylevel/content/securityLevel.js Changes: ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -146,7 +146,7 @@ var SecurityLevelButton = { }); } - panel.openPopup(anchorNode, "bottomcenter topright", 0, 0, false); + panel.openPopup(anchorNode, "bottomright topright", 0, 0, false); }, init() { View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/70e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/70e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.3.1esr-13.0-1] fixup! Bug 40925: Implemented the Security Level component
by Pier Angelo Vendrame (＠pierov) 10 Oct '23

10 Oct '23

Pier Angelo Vendrame pushed to branch base-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 45e4c1dd by Henry Wilkes at 2023-10-10T12:45:38+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 41973: re-align popup panel to the anchor's corner edge. - - - - - 1 changed file: - browser/components/securitylevel/content/securityLevel.js Changes: ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -146,7 +146,7 @@ var SecurityLevelButton = { }); } - panel.openPopup(anchorNode, "bottomcenter topright", 0, 0, false); + panel.openPopup(anchorNode, "bottomright topright", 0, 0, false); }, init() { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/45e4c1d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/45e4c1d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.3.1esr-13.0-1] fixup! Bug 40925: Implemented the Security Level component
by Pier Angelo Vendrame (＠pierov) 10 Oct '23

10 Oct '23

Pier Angelo Vendrame pushed to branch tor-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 4605a45d by Henry Wilkes at 2023-10-10T10:44:08+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 41973: re-align popup panel to the anchor's corner edge. - - - - - 1 changed file: - browser/components/securitylevel/content/securityLevel.js Changes: ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -146,7 +146,7 @@ var SecurityLevelButton = { }); } - panel.openPopup(anchorNode, "bottomcenter topright", 0, 0, false); + panel.openPopup(anchorNode, "bottomright topright", 0, 0, false); }, init() { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4605a45… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4605a45… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.3.1esr-13.0-1] fixup! Bug 41600: Add a tor circuit display panel.
by Pier Angelo Vendrame (＠pierov) 10 Oct '23

10 Oct '23

Pier Angelo Vendrame pushed to branch tor-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: ed56d740 by Henry Wilkes at 2023-10-10T11:27:22+01:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 41973: re-align popup panel to the anchor's corner edge. - - - - - 1 changed file: - browser/components/torcircuit/content/torCircuitPanel.js Changes: ===================================== browser/components/torcircuit/content/torCircuitPanel.js ===================================== @@ -221,7 +221,7 @@ var gTorCircuitPanel = { * This should only be called if the toolbar button is visible. */ show() { - this.panel.openPopup(this.toolbarButton, "bottomcenter topleft", 0, 0); + this.panel.openPopup(this.toolbarButton, "bottomleft topleft", 0, 0); }, /** View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ed56d74… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ed56d74… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.3.1esr-13.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by Pier Angelo Vendrame (＠pierov) 10 Oct '23

10 Oct '23

Pier Angelo Vendrame pushed to branch tor-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: f14c6b11 by Pier Angelo Vendrame at 2023-10-10T08:33:38+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41912: Hide "Use Current Bridges" when we do not have any bridge strings. - - - - - 2 changed files: - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/connectionPane.xhtml Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -99,6 +99,7 @@ const gConnectionPane = (function () { currentHeader: "#torPreferences-currentBridges-header", currentDescription: "#torPreferences-currentBridges-description", currentDescriptionText: "#torPreferences-currentBridges-descriptionText", + controls: "#torPreferences-currentBridges-controls", switch: "#torPreferences-currentBridges-switch", cards: "#torPreferences-currentBridges-cards", cardTemplate: "#torPreferences-bridgeCard-template", @@ -391,6 +392,7 @@ const gConnectionPane = (function () { selectors.bridges.currentHeader ); bridgeHeader.textContent = TorStrings.settings.bridgeCurrent; + const bridgeControls = prefpane.querySelector(selectors.bridges.controls); const bridgeSwitch = prefpane.querySelector(selectors.bridges.switch); bridgeSwitch.setAttribute("label", TorStrings.settings.allBridgesEnabled); bridgeSwitch.addEventListener("toggle", () => { @@ -629,18 +631,17 @@ const gConnectionPane = (function () { const newStrings = new Set(TorSettings.bridges.bridge_strings); const numBridges = newStrings.size; - if (!newStrings.size) { - bridgeHeader.hidden = true; - bridgeDescription.hidden = true; - bridgeCards.hidden = true; + const noBridges = !numBridges; + bridgeHeader.hidden = noBridges; + bridgeDescription.hidden = noBridges; + bridgeControls.hidden = noBridges; + bridgeCards.hidden = noBridges; + if (noBridges) { showAll.hidden = true; removeAll.hidden = true; bridgeCards.textContent = ""; return; } - bridgeHeader.hidden = false; - bridgeDescription.hidden = false; - bridgeCards.hidden = false; // Changing the pressed property on moz-toggle should not trigger its // "toggle" event. bridgeSwitch.pressed = TorSettings.bridges.enabled; @@ -757,7 +758,7 @@ const gConnectionPane = (function () { bridge = provider.currentBridge; } catch (e) { console.warn("Could not get current bridge", e); - } + } if (bridge?.fingerprint !== this._currentBridgeId) { this._currentBridgeId = bridge?.fingerprint ?? null; this._updateConnectedBridges(); ===================================== browser/components/torpreferences/content/connectionPane.xhtml ===================================== @@ -107,7 +107,7 @@ <description flex="1" id="torPreferences-currentBridges-description"> <html:span id="torPreferences-currentBridges-descriptionText" /> </description> - <hbox align="center"> + <hbox align="center" id="torPreferences-currentBridges-controls"> <html:moz-toggle id="torPreferences-currentBridges-switch" label-align-after="" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f14c6b1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f14c6b1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.3.1esr-13.0-1] fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align...
by ma1 (＠ma1) 09 Oct '23

09 Oct '23

ma1 pushed to branch mullvad-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 453cd063 by hackademix at 2023-10-09T20:49:46+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping Bug 41259: Do not interfere with devtools responsive mode sizing. - - - - - 2 changed files: - browser/base/content/browser.css - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== browser/base/content/browser.css ===================================== @@ -140,7 +140,7 @@ body { Never modify the following selector without synchronizing LETTERBOX_CSS_SELECTOR in RFPHelper.jsm! **/ -.letterboxing .browserStack:not(.exclude-letterboxing) > browser { +.letterboxing .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) > browser { /* width & height to be dynamically set by RFPHelper.jsm */ outline: 1px solid var(--chrome-content-separator-color); } @@ -149,7 +149,7 @@ body { outline: initial; } -:root:not([inDOMFullscreen]) .letterboxing.letterboxing-ready .browserStack:not(.exclude-letterboxing) { +:root:not([inDOMFullscreen]) .letterboxing.letterboxing-ready .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) { place-content: start center; } ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -437,7 +437,7 @@ class _RFPHelper { // preemptively in order to beat race conditions on tab/window creation const LETTERBOX_CSS_URL = "chrome://browser/content/browser.css"; const LETTERBOX_CSS_SELECTOR = - ".letterboxing .browserStack:not(.exclude-letterboxing) > browser"; + ".letterboxing .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) > browser"; for (let ss of document.styleSheets) { if (ss.href !== LETTERBOX_CSS_URL) { continue; @@ -557,8 +557,8 @@ class _RFPHelper { const roundDimensions = (aWidth, aHeight) => { const r = (aWidth, aHeight) => ({ - width: `${aWidth}px`, - height: `${aHeight}px`, + width: `var(--rdm-width, ${aWidth}px)`, + height: `var(--rdm-height, ${aHeight}px)`, }); let result; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/453… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/453… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.3.1esr-13.0-1] fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align...
by ma1 (＠ma1) 09 Oct '23

09 Oct '23

ma1 pushed to branch base-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 4ff109fa by hackademix at 2023-10-09T20:47:34+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping Bug 41259: Do not interfere with devtools responsive mode sizing. - - - - - 2 changed files: - browser/base/content/browser.css - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== browser/base/content/browser.css ===================================== @@ -140,7 +140,7 @@ body { Never modify the following selector without synchronizing LETTERBOX_CSS_SELECTOR in RFPHelper.jsm! **/ -.letterboxing .browserStack:not(.exclude-letterboxing) > browser { +.letterboxing .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) > browser { /* width & height to be dynamically set by RFPHelper.jsm */ outline: 1px solid var(--chrome-content-separator-color); } @@ -149,7 +149,7 @@ body { outline: initial; } -:root:not([inDOMFullscreen]) .letterboxing.letterboxing-ready .browserStack:not(.exclude-letterboxing) { +:root:not([inDOMFullscreen]) .letterboxing.letterboxing-ready .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) { place-content: start center; } ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -437,7 +437,7 @@ class _RFPHelper { // preemptively in order to beat race conditions on tab/window creation const LETTERBOX_CSS_URL = "chrome://browser/content/browser.css"; const LETTERBOX_CSS_SELECTOR = - ".letterboxing .browserStack:not(.exclude-letterboxing) > browser"; + ".letterboxing .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) > browser"; for (let ss of document.styleSheets) { if (ss.href !== LETTERBOX_CSS_URL) { continue; @@ -557,8 +557,8 @@ class _RFPHelper { const roundDimensions = (aWidth, aHeight) => { const r = (aWidth, aHeight) => ({ - width: `${aWidth}px`, - height: `${aHeight}px`, + width: `var(--rdm-width, ${aWidth}px)`, + height: `var(--rdm-height, ${aHeight}px)`, }); let result; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4ff109f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4ff109f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.3.1esr-13.0-1] fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align...
by ma1 (＠ma1) 09 Oct '23

09 Oct '23

ma1 pushed to branch tor-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 10f40c2f by hackademix at 2023-10-09T19:54:52+02:00 fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 30556: align letterboxing with 200x100 new win width stepping Bug 41259: Do not interfere with devtools responsive mode sizing. - - - - - 2 changed files: - browser/base/content/browser.css - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== browser/base/content/browser.css ===================================== @@ -140,7 +140,7 @@ body { Never modify the following selector without synchronizing LETTERBOX_CSS_SELECTOR in RFPHelper.jsm! **/ -.letterboxing .browserStack:not(.exclude-letterboxing) > browser { +.letterboxing .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) > browser { /* width & height to be dynamically set by RFPHelper.jsm */ outline: 1px solid var(--chrome-content-separator-color); } @@ -149,7 +149,7 @@ body { outline: initial; } -:root:not([inDOMFullscreen]) .letterboxing.letterboxing-ready .browserStack:not(.exclude-letterboxing) { +:root:not([inDOMFullscreen]) .letterboxing.letterboxing-ready .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) { place-content: start center; } ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -437,7 +437,7 @@ class _RFPHelper { // preemptively in order to beat race conditions on tab/window creation const LETTERBOX_CSS_URL = "chrome://browser/content/browser.css"; const LETTERBOX_CSS_SELECTOR = - ".letterboxing .browserStack:not(.exclude-letterboxing) > browser"; + ".letterboxing .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) > browser"; for (let ss of document.styleSheets) { if (ss.href !== LETTERBOX_CSS_URL) { continue; @@ -557,8 +557,8 @@ class _RFPHelper { const roundDimensions = (aWidth, aHeight) => { const r = (aWidth, aHeight) => ({ - width: `${aWidth}px`, - height: `${aHeight}px`, + width: `var(--rdm-width, ${aWidth}px)`, + height: `var(--rdm-height, ${aHeight}px)`, }); let result; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/10f40c2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/10f40c2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-115.3.1esr-13.0-1-build2
by Pier Angelo Vendrame (＠pierov) 09 Oct '23

09 Oct '23

Pier Angelo Vendrame pushed new tag mullvad-browser-115.3.1esr-13.0-1-build2 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.3.1esr-13.0-1] 6 commits: fixup! Bug 41736: Customize toolbar for base-browser.
by Pier Angelo Vendrame (＠pierov) 05 Oct '23

05 Oct '23

Pier Angelo Vendrame pushed to branch base-browser-115.3.1esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 88684e4d by Henry Wilkes at 2023-10-05T22:40:35+02:00 fixup! Bug 41736: Customize toolbar for base-browser. Bug 41736: Stop placing the NoScript button in the palette, and let it go to the toolbar by default when shown. - - - - - 7d1513ca by Henry Wilkes at 2023-10-05T22:40:37+02:00 fixup! Bug 41598: Prevent NoScript from being removed/disabled. Bug 41736: Add a isNoScript property to Extension class. - - - - - 4bf92938 by Henry Wilkes at 2023-10-05T22:40:37+02:00 Bug 41736: Hide NoScript extension's toolbar button by default. This hides it from both the toolbar and the unified extensions panel. We also hide the unified-extension-button if the panel would be empty: not including the NoScript button when it is hidden. As a result, this will be hidden by default until a user installs another extension (or shows the NoScript button and unpins it). - - - - - e5331a5f by Henry Wilkes at 2023-10-05T22:40:37+02:00 fixup! Firefox preference overrides. Bug 41736: Hide NoScript extension by default. We also hide the unified-extension-button if it would be empty. - - - - - 2b9948b2 by Henry Wilkes at 2023-10-05T22:40:38+02:00 fixup! Bug 41736: Customize toolbar for base-browser. Bug 41581: Keep NoScript button in the toolbar (but hidden) by default. Also includes some migration. - - - - - f0f9f20e by Henry Wilkes at 2023-10-05T22:40:38+02:00 fixup! Base Browser strings Bug 41581: Add strings for changing the visibility of the NoScript toolbar button. - - - - - 9 changed files: - browser/app/profile/001-base-profile.js - browser/base/content/browser-addons.js - browser/components/customizableui/CustomizableUI.sys.mjs - browser/components/extensions/parent/ext-browserAction.js - browser/locales/en-US/browser/base-browser.ftl - browser/themes/shared/addons/unified-extensions.css - toolkit/components/extensions/Extension.sys.mjs - toolkit/mozapps/extensions/content/aboutaddons.html - toolkit/mozapps/extensions/content/aboutaddons.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -220,6 +220,10 @@ pref("privacy.annotate_channels.strict_list.enabled", false); // Disable the Pocket extension (Bug #18886 and #31602) pref("extensions.pocket.enabled", false); +// Custom extensions preferences tor-browser#41581 +pref("extensions.hideNoScript", true); +pref("extensions.hideUnifiedWhenEmpty", true); + // Disable activity stream/"Recommended by Pocket" in about:home (Bug #41029) pref("browser.newtabpage.activity-stream.discoverystream.enabled", false); pref("browser.newtabpage.activity-stream.feeds.section.topstories", false); ===================================== browser/base/content/browser-addons.js ===================================== @@ -26,6 +26,9 @@ XPCOMUtils.defineLazyGetter(lazy, "l10n", function () { ); }); +const HIDE_NO_SCRIPT_PREF = "extensions.hideNoScript"; +const HIDE_UNIFIED_WHEN_EMPTY_PREF = "extensions.hideUnifiedWhenEmpty"; + /** * Mapping of error code -> [error-id, local-error-id] * @@ -1186,6 +1189,18 @@ var gUnifiedExtensions = { gNavToolbox.addEventListener("customizationstarting", this); CustomizableUI.addListener(this); + // Listen out for changes in extensions.hideNoScript and + // extension.hideUnifiedWhenEmpty, which can effect the visibility of the + // unified-extensions-button. + // See tor-browser#41581. + this._hideNoScriptObserver = () => this._updateVisibility(); + Services.prefs.addObserver(HIDE_NO_SCRIPT_PREF, this._hideNoScriptObserver); + Services.prefs.addObserver( + HIDE_UNIFIED_WHEN_EMPTY_PREF, + this._hideNoScriptObserver + ); + this._updateVisibility(); + this._initialized = true; }, @@ -1201,6 +1216,15 @@ var gUnifiedExtensions = { gNavToolbox.removeEventListener("customizationstarting", this); CustomizableUI.removeListener(this); + + Services.prefs.removeObserver( + HIDE_NO_SCRIPT_PREF, + this._hideNoScriptObserver + ); + Services.prefs.removeObserver( + HIDE_UNIFIED_WHEN_EMPTY_PREF, + this._hideNoScriptObserver + ); }, onLocationChange(browser, webProgress, _request, _uri, flags) { @@ -1278,6 +1302,15 @@ var gUnifiedExtensions = { return false; } + // When an extensions is about to be removed, it may still appear in + // getActiveExtensions. + // This is needed for hasExtensionsInPanel, when called through + // onWidgetDestroy when an extension is being removed. + // See tor-browser#41581. + if (extension.hasShutdown) { + return false; + } + // Ignore hidden and extensions that cannot access the current window // (because of PB mode when we are in a private window), since users // cannot do anything with those extensions anyway. @@ -1292,6 +1325,20 @@ var gUnifiedExtensions = { return policies; }, + /** + * Potentially hide the unified-extensions-button if it would be empty. + */ + // See tor-browser#41581. + // The behaviour overlaps with a proposal in mozilla Bug 1778684, which has + // not been implemented, or had much recent activity as of 5th October 2023. + _updateVisibility() { + this.button.classList.toggle( + "hide-empty", + Services.prefs.getBoolPref(HIDE_UNIFIED_WHEN_EMPTY_PREF, true) && + !this.hasExtensionsInPanel() + ); + }, + /** * Returns true when there are active extensions listed/shown in the unified * extensions panel, and false otherwise (e.g. when extensions are pinned in @@ -1300,7 +1347,13 @@ var gUnifiedExtensions = { * @returns {boolean} Whether there are extensions listed in the panel. */ hasExtensionsInPanel() { - const policies = this.getActivePolicies(); + let policies = this.getActivePolicies(); + // If the NoScript button is hidden, we won't count it towards the list of + // extensions in the panel. + // See tor-browser#41581. + if (Services.prefs.getBoolPref(HIDE_NO_SCRIPT_PREF, true)) { + policies = policies.filter(policy => !policy.extension?.isNoScript); + } return !!policies .map(policy => this.browserActionFor(policy)?.widget) @@ -1795,7 +1848,17 @@ var gUnifiedExtensions = { } }, + onWidgetRemoved() { + this._updateVisibility(); + }, + + onWidgetDestroyed() { + this._updateVisibility(); + }, + onWidgetAdded(aWidgetId, aArea, aPosition) { + this._updateVisibility(); + // When we pin a widget to the toolbar from a narrow window, the widget // will be overflowed directly. In this case, we do not want to change the // class name since it is going to be changed by `onWidgetOverflow()` @@ -1811,6 +1874,8 @@ var gUnifiedExtensions = { }, onWidgetOverflow(aNode, aContainer) { + this._updateVisibility(); + // We register a CUI listener for each window so we make sure that we // handle the event for the right window here. if (window !== aNode.ownerGlobal) { @@ -1821,6 +1886,8 @@ var gUnifiedExtensions = { }, onWidgetUnderflow(aNode, aContainer) { + this._updateVisibility(); + // We register a CUI listener for each window so we make sure that we // handle the event for the right window here. if (window !== aNode.ownerGlobal) { ===================================== browser/components/customizableui/CustomizableUI.sys.mjs ===================================== @@ -65,7 +65,8 @@ var kVersion = 19; /** * The current version for base browser. */ -var kVersionBaseBrowser = 1; +var kVersionBaseBrowser = 2; +const NoScriptId = "_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action"; /** * Buttons removed from built-ins by version they were removed. kVersion must be @@ -850,6 +851,57 @@ var CustomizableUIInternal = { delete gSavedState.placements["PanelUI-contents"]; delete gSavedState.placements["addon-bar"]; } + + if (currentVersion < 2) { + // Matches against kVersion 19, i.e. when the unified-extensions-button + // was introduced and extensions were moved from the palette to + // AREA_ADDONS. + // For base browser, we want the NoScript addon to be moved from the + // default palette to AREA_NAVBAR, so that if it becomes shown through the + // preference extensions.hideNoScript it will appear in the toolbar. + // If the NoScript addon is already in AREA_NAVBAR, we instead flip the + // extensions.hideNoScript preference so that it remains visible. + // See tor-browser#41581. + const navbarPlacements = + gSavedState.placements[CustomizableUI.AREA_NAVBAR]; + if (navbarPlacements) { + let noScriptVisible = false; + for (const [area, placements] of Object.entries( + gSavedState.placements + )) { + const index = placements.indexOf(NoScriptId); + if (index === -1) { + continue; + } + if (area === CustomizableUI.AREA_ADDONS) { + // Has been placed in the ADDONS area. + // Most likely, this is an alpha or nightly user who received the + // firefox update in a run before this one. In this case, we want to + // match the same behaviour as a stable user: hide the button and + // move it to the NAVBAR instead. + placements.splice(index, 1); + } else { + // It is in an area other than the ADDON (and not in the palette). + noScriptVisible = true; + } + } + if (noScriptVisible) { + // Keep the button where it is and make sure it is visible. + Services.prefs.setBoolPref("extensions.hideNoScript", false); + } else { + // Should appear just before unified-extensions-button, which is + // currently not part of the default placements. + const placeIndex = navbarPlacements.indexOf( + "unified-extensions-button" + ); + if (placeIndex === -1) { + navbarPlacements.push(NoScriptId); + } else { + navbarPlacements.splice(placeIndex, 0, NoScriptId); + } + } + } + } }, _placeNewDefaultWidgetsInArea(aArea) { @@ -3409,7 +3461,17 @@ var CustomizableUIInternal = { CustomizableUI.isWebExtensionWidget(widgetId) && !oldAddonPlacements.includes(widgetId) ) { - this.addWidgetToArea(widgetId, CustomizableUI.AREA_ADDONS); + // When resetting, NoScript goes to the toolbar instead. This matches + // its initial placement anyway. And since the button may be hidden by + // default by extensions.hideNoScript, we want to make sure that if it + // becomes unhidden it is shown rather than in the unified extensions + // panel. See tor-browser#41581. + this.addWidgetToArea( + widgetId, + widgetId === NoScriptId + ? CustomizableUI.AREA_NAVBAR + : CustomizableUI.AREA_ADDONS + ); } } }, ===================================== browser/components/extensions/parent/ext-browserAction.js ===================================== @@ -176,10 +176,6 @@ this.browserAction = class extends ExtensionAPIPersistent { } build() { - // The extension ID for NoScript (WebExtension) - const isNoScript = - this.extension.id === "{73a6fe31-595d-460b-a920-fcc0f8843232}"; - let { extension } = this; let widgetId = makeWidgetId(extension.id); let widget = CustomizableUI.createWidget({ @@ -190,11 +186,7 @@ this.browserAction = class extends ExtensionAPIPersistent { removable: true, label: this.action.getProperty(null, "title"), tooltiptext: this.action.getProperty(null, "title"), - // Do not want to add the NoScript extension to the toolbar by default. - // tor-browser#41736 - defaultArea: isNoScript - ? null - : browserAreas[this.action.getDefaultArea()], + defaultArea: browserAreas[this.action.getDefaultArea()], showInPrivateBrowsing: extension.privateBrowsingAllowed, disallowSubView: true, @@ -282,6 +274,22 @@ this.browserAction = class extends ExtensionAPIPersistent { node.append(button, menuButton); node.viewButton = button; + if (extension.isNoScript) { + // Hide NoScript by default. + // See tor-browser#41581. + const HIDE_NO_SCRIPT_PREF = "extensions.hideNoScript"; + const changeNoScriptVisibility = () => { + node.hidden = Services.prefs.getBoolPref(HIDE_NO_SCRIPT_PREF, true); + }; + // Since we expect the NoScript widget to only be destroyed on exit, + // we do not set up to remove the observer. + Services.prefs.addObserver( + HIDE_NO_SCRIPT_PREF, + changeNoScriptVisibility + ); + changeNoScriptVisibility(); + } + return node; }, ===================================== browser/locales/en-US/browser/base-browser.ftl ===================================== @@ -24,6 +24,11 @@ basebrowser-rfp-restore-window-size-button-ak = R basebrowser-addon-badge-recommended = Mozilla only recommends extensions that meet their standards for security and performance basebrowser-addon-badge-verified = Mozilla has reviewed this extension to meet their standards for security and performance +## Option to show or hide the NoScript extension button/item. +basebrowser-addon-noscript-visibility-label = Toolbar button +basebrowser-addon-noscript-visibility-show = Show +basebrowser-addon-noscript-visibility-hide = Hide + ## About dialog # "Mozilla Firefox" should be treated like a brand and it should be neither translated nor transliterated. ===================================== browser/themes/shared/addons/unified-extensions.css ===================================== @@ -238,3 +238,21 @@ unified-extensions-item > .subviewbutton { border-color: transparent; } } + +/* Extra rule for tor-browser. See tor-browser#41581. + * We want to hide the unified-extensions-button when it is empty. + * However, this button is needed as an anchor for addon notifications. E.g. + * when installing another addon and permissions pop up. + * If we simply marked it as "hidden" then it would not be used as an anchor, so + * the popup would fall back to using the identity button as an anchor instead. + * So instead, we use "visibility: collapse" whilst it is empty *and* it is not + * being used as an anchor (the open attribute is missing). */ +#unified-extensions-button.hide-empty:not([open]) { + visibility: collapse; + /* Ensure getBoundingClientRect().width returns 0. + * Even though this button is collapsed, and therefore should not take up any + * layout space, getBoundingClientRect will still measure the padding. + * If this was not zero, OverflowableToolbar#getOverflowInfo would + * over-measure the children width and would always overflow. */ + padding-inline: 0; +} ===================================== toolkit/components/extensions/Extension.sys.mjs ===================================== @@ -765,6 +765,15 @@ export class ExtensionData { this.eventPagesEnabled = lazy.eventPagesEnabled; } + /** + * Whether this is the NoScript extension. + * + * @type {boolean} + */ + get isNoScript() { + return this.id === "{73a6fe31-595d-460b-a920-fcc0f8843232}"; + } + /** * A factory function that allows the construction of ExtensionData, with * the isPrivileged flag computed asynchronously. @@ -3498,7 +3507,7 @@ export class Extension extends ExtensionData { } // Bug 40253: Explicitly allow NoScript in Private Browsing mode. - if (this.id === "{73a6fe31-595d-460b-a920-fcc0f8843232}") { + if (this.isNoScript) { lazy.ExtensionPermissions.add(this.id, { permissions: [PRIVATE_ALLOWED_PERMISSION], origins: [], ===================================== toolkit/mozapps/extensions/content/aboutaddons.html ===================================== @@ -508,6 +508,32 @@ <div class="addon-detail-sitepermissions"> <addon-sitepermissions-list></addon-sitepermissions-list> </div> +  + <div + class="addon-detail-row addon-detail-row-noscript-visibility" + role="radiogroup" + hidden="hidden" + > + <span + class="addon-noscript-visibility-label" + data-l10n-id="basebrowser-addon-noscript-visibility-label" + ></span> + <div class="addon-detail-actions"> + <label class="radio-container-with-text"> + <input type="radio" name="noscript-visibility" value="show" /> + <span + data-l10n-id="basebrowser-addon-noscript-visibility-show" + ></span> + </label> + <label class="radio-container-with-text"> + <input type="radio" name="noscript-visibility" value="hide" /> + <span + data-l10n-id="basebrowser-addon-noscript-visibility-hide" + ></span> + </label> + </div> + </div> <div class="addon-detail-row addon-detail-row-updates"> <label data-l10n-id="addon-detail-updates-label"></label> <div class="addon-detail-actions"> ===================================== toolkit/mozapps/extensions/content/aboutaddons.js ===================================== @@ -2063,6 +2063,8 @@ class AddonSitePermissionsList extends HTMLElement { } customElements.define("addon-sitepermissions-list", AddonSitePermissionsList); +const HIDE_NO_SCRIPT_PREF = "extensions.hideNoScript"; + class AddonDetails extends HTMLElement { connectedCallback() { if (!this.children.length) { @@ -2070,12 +2072,61 @@ class AddonDetails extends HTMLElement { } this.deck.addEventListener("view-changed", this); this.descriptionShowMoreButton.addEventListener("click", this); + + // If this is for the NoScript extension, we listen for changes in the + // visibility of its toolbar button. + // See tor-browser#41581. + // NOTE: The addon should be set before being connected, so isNoScript will + // return a correct value. + if (this.isNoScript && !this._noScriptVisibilityObserver) { + this._noScriptVisibilityObserver = () => this.updateNoScriptVisibility(); + Services.prefs.addObserver( + HIDE_NO_SCRIPT_PREF, + this._noScriptVisibilityObserver + ); + } } disconnectedCallback() { this.inlineOptions.destroyBrowser(); this.deck.removeEventListener("view-changed", this); this.descriptionShowMoreButton.removeEventListener("click", this); + + if (this._noScriptVisibilityObserver) { + Services.prefs.removeObserver( + HIDE_NO_SCRIPT_PREF, + this._noScriptVisibilityObserver + ); + // Clear in case this is called again, or if connectedCallback is called. + delete this._noScriptVisibilityObserver; + } + } + + /** + * Whether this is a description for the NoScript extension. + * + * @type {boolean} + */ + get isNoScript() { + return this.addon?.id === "{73a6fe31-595d-460b-a920-fcc0f8843232}"; + } + + /** + * Update the shown visibility value for the NoScript extension's toolbar + * button. + */ + updateNoScriptVisibility() { + if (!this.isNoScript) { + return; + } + const visibility = Services.prefs.getBoolPref(HIDE_NO_SCRIPT_PREF, true) + ? "hide" + : "show"; + for (const input of this.querySelectorAll( + ".addon-detail-row-noscript-visibility input" + )) { + input.checked = input.value === visibility; + } } handleEvent(e) { @@ -2271,6 +2322,27 @@ class AddonDetails extends HTMLElement { "upgrade" ); + // If this is the NoScript extension, we want to show an option to change + // the visibility of its toolbar button. + // See tor-browser#41581. + const visibilityRow = this.querySelector( + ".addon-detail-row-noscript-visibility" + ); + visibilityRow.hidden = !this.isNoScript; + if (this.isNoScript) { + // Set up the aria-label for the role="radiogroup". + const visibilityLabel = visibilityRow.querySelector( + ".addon-noscript-visibility-label" + ); + visibilityLabel.id = ExtensionCommon.makeWidgetId( + `${addon.id}-noscript-visibility-label` + ); + visibilityRow.setAttribute("aria-labelledby", visibilityLabel.id); + + // Set the initial displayed value. + this.updateNoScriptVisibility(); + } + if (addon.type != "extension") { // Don't show any private browsing related section for non-extension // addon types, because not relevant or they are either always allowed @@ -2662,6 +2734,11 @@ class AddonCard extends HTMLElement { // Update the card if the add-on isn't active. this.update(); } + } else if (name == "noscript-visibility") { + // Update the NoScript toolbar button visibility. + // See tor-browser#41581. + const hide = e.target.value !== "show"; + Services.prefs.setBoolPref(HIDE_NO_SCRIPT_PREF, hide); } } else if (e.type == "mousedown") { // Open panel on mousedown when the mouse is used. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e8fd5d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e8fd5d… You're receiving this email because of your account on gitlab.torproject.org.

1 0