- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-78.0.1esr-10.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by sysrqb＠torproject.org 31 Jul '20

31 Jul '20

commit f7094ffb9dd9ac0af6add386fcfc04fc8e97fff6 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 14 14:29:49 2020 -0400 squash! TB4: Tor Browser's Firefox preference overrides. Bug 33855: Ensure that site-specific browser mode is disabled. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index ea1ca074c893..b44b4d58f446 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -63,6 +63,8 @@ pref("browser.sessionstore.privacy_level", 2); // Use the in-memory media cache and increase its maximum size (#29120) pref("browser.privatebrowsing.forceMediaMemoryCache", true); pref("media.memory_cache_max_size", 16384); +// Disable site-specific browsing to avoid sharing site icons with the OS. +pref("browser.ssb.enabled", false); // Misc privacy: Remote pref("browser.send_pings", false);

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by sysrqb＠torproject.org 31 Jul '20

31 Jul '20

commit 9132079c4670343147093fdc06183b86a8db569c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jul 17 14:53:30 2020 -0400 squash! TB4: Tor Browser's Firefox preference overrides. Bug 30682: Disable Intermediate CA Preloading. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index ea1ca074c893..d08285d5c5de 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -128,6 +128,8 @@ pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now pref("browser.cache.frecency_experiment", -1); +// Disable intermediate preloading (Bug 30682) +pref("security.remote_settings.intermediates.enabled", false); // Bug 2874: Block Components.interfaces from content pref("dom.use_components_shim", false); // Enable letterboxing

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] fixup! Bug 28005: Implement .onion alias urlbar rewrites
by sysrqb＠torproject.org 31 Jul '20

31 Jul '20

commit 90a93e6906657ed96a2f5918dbf18430ca5e50da Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jul 20 21:27:16 2020 +0200 fixup! Bug 28005: Implement .onion alias urlbar rewrites --- browser/actors/ClickHandlerChild.jsm | 20 +++++++++ browser/actors/ClickHandlerParent.jsm | 1 + browser/actors/ContextMenuChild.jsm | 4 ++ browser/base/content/browser.js | 36 +++++++++++---- browser/base/content/nsContextMenu.js | 18 ++++++++ browser/base/content/tabbrowser.js | 7 +++ browser/base/content/utilityOverlay.js | 12 +++++ .../components/onionservices/OnionAliasStore.jsm | 12 ++--- docshell/base/nsDocShell.cpp | 52 ++++++++++++++++++++++ docshell/base/nsDocShell.h | 6 +++ docshell/base/nsDocShellLoadState.cpp | 4 ++ docshell/base/nsIDocShell.idl | 5 +++ docshell/base/nsIWebNavigation.idl | 5 +++ docshell/shistory/SessionHistoryEntry.cpp | 14 ++++++ docshell/shistory/SessionHistoryEntry.h | 1 + docshell/shistory/nsISHEntry.idl | 5 +++ docshell/shistory/nsSHEntry.cpp | 22 ++++++++- docshell/shistory/nsSHEntry.h | 1 + dom/interfaces/base/nsIBrowser.idl | 3 +- dom/ipc/BrowserChild.cpp | 2 + dom/ipc/BrowserParent.cpp | 3 +- dom/ipc/PBrowser.ipdl | 1 + modules/libpref/init/StaticPrefList.yaml | 6 +++ netwerk/ipc/DocumentLoadListener.cpp | 10 +++++ toolkit/content/widgets/browser-custom-element.js | 13 +++++- toolkit/modules/sessionstore/SessionHistory.jsm | 5 +++ 26 files changed, 249 insertions(+), 19 deletions(-) diff --git a/browser/actors/ClickHandlerChild.jsm b/browser/actors/ClickHandlerChild.jsm index 7dd060e83061..206a8fc97a4d 100644 --- a/browser/actors/ClickHandlerChild.jsm +++ b/browser/actors/ClickHandlerChild.jsm @@ -138,6 +138,26 @@ class ClickHandlerChild extends JSWindowActorChild { json.originStoragePrincipal = ownerDoc.effectiveStoragePrincipal; json.triggeringPrincipal = ownerDoc.nodePrincipal; + // Check if the link needs to be opened with .tor.onion urlbar rewrites + // allowed. Only when the owner doc has onionUrlbarRewritesAllowed = true + // and the same origin we should allow this. + json.onionUrlbarRewritesAllowed = false; + if (this.docShell.onionUrlbarRewritesAllowed) { + const sm = Services.scriptSecurityManager; + try { + let targetURI = Services.io.newURI(href); + let isPrivateWin = + ownerDoc.nodePrincipal.originAttributes.privateBrowsingId > 0; + sm.checkSameOriginURI( + docshell.currentDocumentChannel.URI, + targetURI, + false, + isPrivateWin + ); + json.onionUrlbarRewritesAllowed = true; + } catch (e) {} + } + // If a link element is clicked with middle button, user wants to open // the link somewhere rather than pasting clipboard content. Therefore, // when it's clicked with middle button, we should prevent multiple diff --git a/browser/actors/ClickHandlerParent.jsm b/browser/actors/ClickHandlerParent.jsm index 454c0fe69b27..42ab7a0f6e2a 100644 --- a/browser/actors/ClickHandlerParent.jsm +++ b/browser/actors/ClickHandlerParent.jsm @@ -102,6 +102,7 @@ class ClickHandlerParent extends JSWindowActorParent { charset: browser.characterSet, referrerInfo: E10SUtils.deserializeReferrerInfo(data.referrerInfo), allowMixedContent: data.allowMixedContent, + onionUrlbarRewritesAllowed: data.onionUrlbarRewritesAllowed, isContentWindowPrivate: data.isContentWindowPrivate, originPrincipal: data.originPrincipal, originStoragePrincipal: data.originStoragePrincipal, diff --git a/browser/actors/ContextMenuChild.jsm b/browser/actors/ContextMenuChild.jsm index 16a3f8ecbc81..1a1b38aa6375 100644 --- a/browser/actors/ContextMenuChild.jsm +++ b/browser/actors/ContextMenuChild.jsm @@ -575,6 +575,9 @@ class ContextMenuChild extends JSWindowActorChild { // The same-origin check will be done in nsContextMenu.openLinkInTab. let parentAllowsMixedContent = !!this.docShell.mixedContentChannel; + let parentAllowsOnionUrlbarRewrites = this.docShell + .onionUrlbarRewritesAllowed; + let disableSetDesktopBackground = null; // Media related cache info parent needs for saving @@ -687,6 +690,7 @@ class ContextMenuChild extends JSWindowActorChild { frameBrowsingContextID, disableSetDesktopBackground, parentAllowsMixedContent, + parentAllowsOnionUrlbarRewrites, }; if (context.inFrame && !context.inSrcdocFrame) { diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index ff4c30ca876e..5d99785d5ec0 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -2248,6 +2248,7 @@ var gBrowserInit = { // [9]: allowInheritPrincipal (bool) // [10]: csp (nsIContentSecurityPolicy) // [11]: nsOpenWindowInfo + // [12]: onionUrlbarRewritesAllowed let userContextId = window.arguments[5] != undefined ? window.arguments[5] @@ -2267,7 +2268,8 @@ var gBrowserInit = { // TODO fix allowInheritPrincipal to default to false. // Default to true unless explicitly set to false because of bug 1475201. window.arguments[9] !== false, - window.arguments[10] + window.arguments[10], + window.arguments[12] ); window.focus(); } else { @@ -3153,7 +3155,8 @@ function loadURI( forceAboutBlankViewerInCurrent, triggeringPrincipal, allowInheritPrincipal = false, - csp = null + csp = null, + onionUrlbarRewritesAllowed = false ) { if (!triggeringPrincipal) { throw new Error("Must load with a triggering Principal"); @@ -3171,6 +3174,7 @@ function loadURI( csp, forceAboutBlankViewerInCurrent, allowInheritPrincipal, + onionUrlbarRewritesAllowed, }); } catch (e) { Cu.reportError(e); @@ -5282,16 +5286,14 @@ var XULBrowserWindow = { this.reloadCommand.removeAttribute("disabled"); } - // The onion memorable alias needs to be used in URLBarSetURI, but also in + // The onion memorable alias needs to be used in gURLBar.setURI, but also in // other parts of the code (like the bookmarks UI), so we save it. - const onionRewritesDisabled = Services.prefs.getBoolPref( - "browser.urlbar.onionRewrites.disabled", - false - ); - if (!onionRewritesDisabled) { + if (gBrowser.selectedBrowser.onionUrlbarRewritesAllowed) { gBrowser.selectedBrowser.currentOnionAliasURI = OnionAliasStore.getShortURI( - aLocationURI + gBrowser.selectedBrowser.currentURI ); + } else { + gBrowser.selectedBrowser.currentOnionAliasURI = null; } // We want to update the popup visibility if we received this notification @@ -6961,6 +6963,21 @@ function handleLinkClick(event, href, linkNode) { } catch (e) {} } + // Check if the link needs to be opened with .tor.onion urlbar rewrites + // allowed. Only when the owner doc has onionUrlbarRewritesAllowed = true + // and the same origin we should allow this. + let persistOnionUrlbarRewritesAllowedInChildTab = false; + if (where == "tab" && gBrowser.docShell.onionUrlbarRewritesAllowed) { + const sm = Services.scriptSecurityManager; + try { + let tURI = makeURI(href); + let isPrivateWin = + doc.nodePrincipal.originAttributes.privateBrowsingId > 0; + sm.checkSameOriginURI(doc.documentURIObject, tURI, false, isPrivateWin); + persistOnionUrlbarRewritesAllowedInChildTab = true; + } catch (e) {} + } + let frameOuterWindowID = WebNavigationFrames.getFrameId(doc.defaultView); urlSecurityCheck(href, doc.nodePrincipal); @@ -6973,6 +6990,7 @@ function handleLinkClick(event, href, linkNode) { triggeringPrincipal: doc.nodePrincipal, csp: doc.csp, frameOuterWindowID, + onionUrlbarRewritesAllowed: persistOnionUrlbarRewritesAllowedInChildTab, }; // The new tab/window must use the same userContextId diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js index 314f7a1364da..80a8379ab35b 100644 --- a/browser/base/content/nsContextMenu.js +++ b/browser/base/content/nsContextMenu.js @@ -57,6 +57,7 @@ function openContextMenu(aMessage, aBrowser, aActor) { disableSetDesktopBackground: data.disableSetDesktopBackground, loginFillInfo: data.loginFillInfo, parentAllowsMixedContent: data.parentAllowsMixedContent, + parentAllowsOnionUrlbarRewrites: data.parentAllowsOnionUrlbarRewrites, userContextId: data.userContextId, webExtContextData: data.webExtContextData, }; @@ -1049,6 +1050,7 @@ class nsContextMenu { triggeringPrincipal: this.principal, csp: this.csp, frameOuterWindowID: this.contentData.frameOuterWindowID, + onionUrlbarRewritesAllowed: false, }; for (let p in extra) { params[p] = extra[p]; @@ -1072,6 +1074,22 @@ class nsContextMenu { } params.referrerInfo = referrerInfo; + + // Check if the link needs to be opened with .tor.onion urlbar rewrites + // allowed. Only when parent has onionUrlbarRewritesAllowed = true + // and the same origin we should allow this. + if (this.contentData.parentAllowsOnionUrlbarRewrites) { + let referrerURI = this.contentData.documentURIObject; + const sm = Services.scriptSecurityManager; + try { + let targetURI = this.linkURI; + let isPrivateWin = + this.browser.contentPrincipal.originAttributes.privateBrowsingId > 0; + sm.checkSameOriginURI(referrerURI, targetURI, false, isPrivateWin); + params.onionUrlbarRewritesAllowed = true; + } catch (e) {} + } + return params; } diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js index 22c7fafef72b..573b114d7813 100644 --- a/browser/base/content/tabbrowser.js +++ b/browser/base/content/tabbrowser.js @@ -1547,6 +1547,7 @@ var aRelatedToCurrent; var aAllowInheritPrincipal; var aAllowMixedContent; + var aOnionUrlbarRewritesAllowed; var aSkipAnimation; var aForceNotRemote; var aPreferredRemoteType; @@ -1577,6 +1578,7 @@ aRelatedToCurrent = params.relatedToCurrent; aAllowInheritPrincipal = !!params.allowInheritPrincipal; aAllowMixedContent = params.allowMixedContent; + aOnionUrlbarRewritesAllowed = params.onionUrlbarRewritesAllowed; aSkipAnimation = params.skipAnimation; aForceNotRemote = params.forceNotRemote; aPreferredRemoteType = params.preferredRemoteType; @@ -1618,6 +1620,7 @@ relatedToCurrent: aRelatedToCurrent, skipAnimation: aSkipAnimation, allowMixedContent: aAllowMixedContent, + onionUrlbarRewritesAllowed: aOnionUrlbarRewritesAllowed, forceNotRemote: aForceNotRemote, createLazyBrowser: aCreateLazyBrowser, preferredRemoteType: aPreferredRemoteType, @@ -2504,6 +2507,7 @@ { allowInheritPrincipal, allowMixedContent, + onionUrlbarRewritesAllowed, allowThirdPartyFixup, bulkOrderedOpen, charset, @@ -2833,6 +2837,9 @@ if (allowMixedContent) { flags |= Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_MIXED_CONTENT; } + if (onionUrlbarRewritesAllowed) { + flags |= Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_ONION_URLBAR_REWRITES; + } if (!allowInheritPrincipal) { flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL; } diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js index a23d6f05e6a7..eb13d5a3435c 100644 --- a/browser/base/content/utilityOverlay.js +++ b/browser/base/content/utilityOverlay.js @@ -367,6 +367,7 @@ function openLinkIn(url, where, params) { var aRelatedToCurrent = params.relatedToCurrent; var aAllowInheritPrincipal = !!params.allowInheritPrincipal; var aAllowMixedContent = params.allowMixedContent; + var aOnionUrlbarRewritesAllowed = params.onionUrlbarRewritesAllowed; var aForceAllowDataURI = params.forceAllowDataURI; var aInBackground = params.inBackground; var aInitiatingDoc = params.initiatingDoc; @@ -482,6 +483,11 @@ function openLinkIn(url, where, params) { ].createInstance(Ci.nsISupportsPRBool); allowThirdPartyFixupSupports.data = aAllowThirdPartyFixup; + var onionUrlbarRewritesAllowed = Cc[ + "@mozilla.org/supports-PRBool;1" + ].createInstance(Ci.nsISupportsPRBool); + onionUrlbarRewritesAllowed.data = aOnionUrlbarRewritesAllowed; + var userContextIdSupports = Cc[ "@mozilla.org/supports-PRUint32;1" ].createInstance(Ci.nsISupportsPRUint32); @@ -498,6 +504,8 @@ function openLinkIn(url, where, params) { sa.appendElement(aTriggeringPrincipal); sa.appendElement(null); // allowInheritPrincipal sa.appendElement(aCsp); + sa.appendElement(null); // nsOpenWindowInfo + sa.appendElement(onionUrlbarRewritesAllowed); const sourceWindow = w || window; let win; @@ -614,6 +622,9 @@ function openLinkIn(url, where, params) { if (aForceAllowDataURI) { flags |= Ci.nsIWebNavigation.LOAD_FLAGS_FORCE_ALLOW_DATA_URI; } + if (aOnionUrlbarRewritesAllowed) { + flags |= Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_ONION_URLBAR_REWRITES; + } let { URI_INHERITS_SECURITY_CONTEXT } = Ci.nsIProtocolHandler; if ( @@ -661,6 +672,7 @@ function openLinkIn(url, where, params) { relatedToCurrent: aRelatedToCurrent, skipAnimation: aSkipTabAnimation, allowMixedContent: aAllowMixedContent, + onionUrlbarRewritesAllowed: aOnionUrlbarRewritesAllowed, userContextId: aUserContextId, originPrincipal: aPrincipal, originStoragePrincipal: aStoragePrincipal, diff --git a/browser/components/onionservices/OnionAliasStore.jsm b/browser/components/onionservices/OnionAliasStore.jsm index 7e006e59490b..66cf569227bf 100644 --- a/browser/components/onionservices/OnionAliasStore.jsm +++ b/browser/components/onionservices/OnionAliasStore.jsm @@ -65,6 +65,7 @@ class _OnionAliasStore { this._removeObserver = () => {}; this._canLoadRules = false; this._rulesetTimestamp = null; + this._updateChannelInstalled = false; } async _periodicRulesetCheck() { @@ -99,24 +100,25 @@ class _OnionAliasStore { async init() { this.httpsEverywhereControl = new HttpsEverywhereControl(); - // Install update channel - await this.httpsEverywhereControl.installTorOnionUpdateChannel(); - // Setup .tor.onion rule loading. // The http observer is a fallback, and is removed in _loadRules() as soon as we are able // to load some rules from HTTPS Everywhere. this._loadHttpObserver(); try { + await this.httpsEverywhereControl.installTorOnionUpdateChannel(); + this._updateChannelInstalled = true; await this.httpsEverywhereControl.getTorOnionRules(); this._canLoadRules = true; } catch (e) { // Loading rules did not work, probably because "get_simple_rules_ending_with" is not yet // working in https-everywhere. Use an http observer as a fallback for learning the rules. - log.debug("Could not load rules, using http observer as fallback"); + log.debug(`Could not load rules: ${e.message}`); } // Setup checker for https-everywhere ruleset updates - this._periodicRulesetCheck(); + if (this._updateChannelInstalled) { + this._periodicRulesetCheck(); + } } /** diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 675ee0592847..01a4daf5bc00 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -5651,6 +5651,10 @@ void nsDocShell::OnRedirectStateChange(nsIChannel* aOldChannel, return; } + if (!mOnionUrlbarRewritesAllowed && IsTorOnionRedirect(oldURI, newURI)) { + mOnionUrlbarRewritesAllowed = true; + } + // DocumentChannel adds redirect chain to global history in the parent // process. The redirect chain can't be queried from the content process, so // there's no need to update global history here. @@ -8675,6 +8679,20 @@ nsresult nsDocShell::HandleSameDocumentNavigation( return NS_OK; } +/* static */ +bool nsDocShell::IsTorOnionRedirect(nsIURI* aOldURI, nsIURI* aNewURI) { + nsAutoCString oldHost; + nsAutoCString newHost; + if (aOldURI && aNewURI && NS_SUCCEEDED(aOldURI->GetHost(oldHost)) && + StringEndsWith(oldHost, NS_LITERAL_CSTRING(".tor.onion")) && + NS_SUCCEEDED(aNewURI->GetHost(newHost)) && + StringEndsWith(newHost, NS_LITERAL_CSTRING(".onion")) && + !StringEndsWith(newHost, NS_LITERAL_CSTRING(".tor.onion"))) { + return true; + } + return false; + } + nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState, nsIDocShell** aDocShell, nsIRequest** aRequest) { @@ -8826,6 +8844,30 @@ nsresult nsDocShell::InternalLoad(nsDocShellLoadState* aLoadState, mAllowKeywordFixup = aLoadState->HasLoadFlags(INTERNAL_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP); + + if (mOnionUrlbarRewritesAllowed) { + mOnionUrlbarRewritesAllowed = false; + nsCOMPtr<nsIURI> referrer; + nsIReferrerInfo* referrerInfo = aLoadState->GetReferrerInfo(); + if (referrerInfo) { + referrerInfo->GetOriginalReferrer(getter_AddRefs(referrer)); + bool isPrivateWin = false; + Document* doc = GetDocument(); + if (doc) { + isPrivateWin = + doc->NodePrincipal()->OriginAttributesRef().mPrivateBrowsingId > 0; + nsCOMPtr<nsIScriptSecurityManager> secMan = + do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID); + mOnionUrlbarRewritesAllowed = + secMan && NS_SUCCEEDED(secMan->CheckSameOriginURI( + aLoadState->URI(), referrer, false, isPrivateWin)); + } + } + } + mOnionUrlbarRewritesAllowed = + mOnionUrlbarRewritesAllowed || + aLoadState->HasLoadFlags(INTERNAL_LOAD_FLAGS_ALLOW_ONION_URLBAR_REWRITES); + mURIResultedInDocument = false; // reset the clock... // See if this is actually a load between two history entries for the same @@ -10971,6 +11013,7 @@ nsresult nsDocShell::AddToSessionHistory( mDynamicallyCreated, originalURI, resultPrincipalURI, loadReplace, referrerInfo, srcdoc, srcdocEntry, baseURI, saveLayoutState, expired); + entry->SetOnionUrlbarRewritesAllowed(mOnionUrlbarRewritesAllowed); if (root == static_cast<nsIDocShellTreeItem*>(this) && GetSessionHistory()) { bool shouldPersist = ShouldAddToSessionHistory(aURI, aChannel); @@ -12768,3 +12811,12 @@ bool nsDocShell::GetIsAttemptingToNavigate() { return false; } + +NS_IMETHODIMP +nsDocShell::GetOnionUrlbarRewritesAllowed(bool* aOnionUrlbarRewritesAllowed) { + NS_ENSURE_ARG(aOnionUrlbarRewritesAllowed); + *aOnionUrlbarRewritesAllowed = + StaticPrefs::browser_urlbar_onionRewrites_enabled() && + mOnionUrlbarRewritesAllowed; + return NS_OK; +} diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h index dcffed8e5537..d403a06f4c9f 100644 --- a/docshell/base/nsDocShell.h +++ b/docshell/base/nsDocShell.h @@ -152,6 +152,9 @@ class nsDocShell final : public nsDocLoader, // Whether the load should go through LoadURIDelegate. INTERNAL_LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE = 0x2000, + + // Whether rewriting the urlbar to a short .onion alias is allowed. + INTERNAL_LOAD_FLAGS_ALLOW_ONION_URLBAR_REWRITES = 0x4000, }; // Event type dispatched by RestorePresentation @@ -582,6 +585,8 @@ class nsDocShell final : public nsDocLoader, virtual void DestroyChildren() override; + static bool IsTorOnionRedirect(nsIURI* aOldURI, nsIURI* aNewURI); + // Overridden from nsDocLoader, this provides more information than the // normal OnStateChange with flags STATE_REDIRECTING virtual void OnRedirectStateChange(nsIChannel* aOldChannel, @@ -1264,6 +1269,7 @@ class nsDocShell final : public nsDocLoader, bool mCSSErrorReportingEnabled : 1; bool mAllowAuth : 1; bool mAllowKeywordFixup : 1; + bool mOnionUrlbarRewritesAllowed : 1; bool mIsOffScreenBrowser : 1; bool mDisableMetaRefreshWhenInactive : 1; bool mIsAppTab : 1; diff --git a/docshell/base/nsDocShellLoadState.cpp b/docshell/base/nsDocShellLoadState.cpp index 9f9b8f406fd4..053773df6319 100644 --- a/docshell/base/nsDocShellLoadState.cpp +++ b/docshell/base/nsDocShellLoadState.cpp @@ -728,6 +728,10 @@ void nsDocShellLoadState::CalculateLoadURIFlags() { mLoadFlags |= nsDocShell::INTERNAL_LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP; } + if (oldLoadFlags & nsIWebNavigation::LOAD_FLAGS_ALLOW_ONION_URLBAR_REWRITES) { + mLoadFlags |= nsDocShell::INTERNAL_LOAD_FLAGS_ALLOW_ONION_URLBAR_REWRITES; + } + if (oldLoadFlags & nsIWebNavigation::LOAD_FLAGS_FIRST_LOAD) { mLoadFlags |= nsDocShell::INTERNAL_LOAD_FLAGS_FIRST_LOAD; } diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl index 01dc4734eb19..305acfd3a98f 100644 --- a/docshell/base/nsIDocShell.idl +++ b/docshell/base/nsIDocShell.idl @@ -1019,4 +1019,9 @@ interface nsIDocShell : nsIDocShellTreeItem * until session history state is moved into the parent process. */ void persistLayoutHistoryState(); + + /** + * Whether rewriting the urlbar to a short .onion alias is allowed. + */ + [infallible] readonly attribute boolean onionUrlbarRewritesAllowed; }; diff --git a/docshell/base/nsIWebNavigation.idl b/docshell/base/nsIWebNavigation.idl index bbc3eb7583a2..a4cceb52b2a0 100644 --- a/docshell/base/nsIWebNavigation.idl +++ b/docshell/base/nsIWebNavigation.idl @@ -237,6 +237,11 @@ interface nsIWebNavigation : nsISupports */ const unsigned long LOAD_FLAGS_BYPASS_LOAD_URI_DELEGATE = 0x4000000; + /** + * Allow rewriting the urlbar to a short .onion alias. + */ + const unsigned long LOAD_FLAGS_ALLOW_ONION_URLBAR_REWRITES = 0x8000000; + /** * Loads a given URI. This will give priority to loading the requested URI * in the object implementing this interface. If it can't be loaded here diff --git a/docshell/shistory/SessionHistoryEntry.cpp b/docshell/shistory/SessionHistoryEntry.cpp index 07a28d1291c9..566b7d68fae5 100644 --- a/docshell/shistory/SessionHistoryEntry.cpp +++ b/docshell/shistory/SessionHistoryEntry.cpp @@ -490,6 +490,20 @@ SessionHistoryEntry::SetPersist(bool aPersist) { return NS_OK; } +NS_IMETHODIMP +SessionHistoryEntry::GetOnionUrlbarRewritesAllowed( + bool* aOnionUrlbarRewritesAllowed) { + *aOnionUrlbarRewritesAllowed = mInfo->mOnionUrlbarRewritesAllowed; + return NS_OK; +} + +NS_IMETHODIMP +SessionHistoryEntry::SetOnionUrlbarRewritesAllowed( + bool aOnionUrlbarRewritesAllowed) { + mInfo->mOnionUrlbarRewritesAllowed = aOnionUrlbarRewritesAllowed; + return NS_OK; +} + NS_IMETHODIMP SessionHistoryEntry::GetScrollPosition(int32_t* aX, int32_t* aY) { *aX = mInfo->mScrollPositionX; diff --git a/docshell/shistory/SessionHistoryEntry.h b/docshell/shistory/SessionHistoryEntry.h index fa6108952688..c51682a65b0a 100644 --- a/docshell/shistory/SessionHistoryEntry.h +++ b/docshell/shistory/SessionHistoryEntry.h @@ -58,6 +58,7 @@ class SessionHistoryInfo { bool mIsSrcdocEntry = false; bool mScrollRestorationIsManual = false; bool mPersist = false; + bool mOnionUrlbarRewritesAllowed = false; }; // XXX Not sure that the id shouldn't just live in SessionHistoryInfo. diff --git a/docshell/shistory/nsISHEntry.idl b/docshell/shistory/nsISHEntry.idl index 8bbf2a68687c..bf410bfcc05a 100644 --- a/docshell/shistory/nsISHEntry.idl +++ b/docshell/shistory/nsISHEntry.idl @@ -242,6 +242,11 @@ interface nsISHEntry : nsISupports */ [infallible] attribute boolean persist; + /** + * Whether rewriting the urlbar to a short .onion alias is allowed. + */ + [infallible] attribute boolean onionUrlbarRewritesAllowed; + /** * Set/Get the visual viewport scroll position if session history is * changed through anchor navigation or pushState. diff --git a/docshell/shistory/nsSHEntry.cpp b/docshell/shistory/nsSHEntry.cpp index 229b15eff25d..12d38f4c55fe 100644 --- a/docshell/shistory/nsSHEntry.cpp +++ b/docshell/shistory/nsSHEntry.cpp @@ -44,7 +44,8 @@ nsSHEntry::nsSHEntry(nsISHistory* aSHistory) mIsSrcdocEntry(false), mScrollRestorationIsManual(false), mLoadedInThisProcess(false), - mPersist(true) {} + mPersist(true), + mOnionUrlbarRewritesAllowed(false) {} nsSHEntry::nsSHEntry(const nsSHEntry& aOther) : mShared(aOther.mShared), @@ -70,7 +71,8 @@ nsSHEntry::nsSHEntry(const nsSHEntry& aOther) mIsSrcdocEntry(aOther.mIsSrcdocEntry), mScrollRestorationIsManual(false), mLoadedInThisProcess(aOther.mLoadedInThisProcess), - mPersist(aOther.mPersist) {} + mPersist(aOther.mPersist), + mOnionUrlbarRewritesAllowed(aOther.mOnionUrlbarRewritesAllowed) {} nsSHEntry::~nsSHEntry() { // Null out the mParent pointers on all our kids. @@ -824,6 +826,18 @@ nsSHEntry::SetPersist(bool aPersist) { return NS_OK; } +NS_IMETHODIMP +nsSHEntry::GetOnionUrlbarRewritesAllowed(bool* aOnionUrlbarRewritesAllowed) { + *aOnionUrlbarRewritesAllowed = mOnionUrlbarRewritesAllowed; + return NS_OK; +} + +NS_IMETHODIMP +nsSHEntry::SetOnionUrlbarRewritesAllowed(bool aOnionUrlbarRewritesAllowed) { + mOnionUrlbarRewritesAllowed = aOnionUrlbarRewritesAllowed; + return NS_OK; +} + NS_IMETHODIMP nsSHEntry::CreateLoadInfo(nsDocShellLoadState** aLoadState) { nsCOMPtr<nsIURI> uri = GetURI(); @@ -873,6 +887,10 @@ nsSHEntry::CreateLoadInfo(nsDocShellLoadState** aLoadState) { } else { srcdoc = VoidString(); } + if (GetOnionUrlbarRewritesAllowed()) { + flags |= nsDocShell::InternalLoad:: + INTERNAL_LOAD_FLAGS_ALLOW_ONION_URLBAR_REWRITES; + } loadState->SetSrcdocData(srcdoc); loadState->SetBaseURI(baseURI); loadState->SetLoadFlags(flags); diff --git a/docshell/shistory/nsSHEntry.h b/docshell/shistory/nsSHEntry.h index 351f6f200a33..6bc9de521437 100644 --- a/docshell/shistory/nsSHEntry.h +++ b/docshell/shistory/nsSHEntry.h @@ -63,6 +63,7 @@ class nsSHEntry : public nsISHEntry { bool mScrollRestorationIsManual; bool mLoadedInThisProcess; bool mPersist; + bool mOnionUrlbarRewritesAllowed; }; #endif /* nsSHEntry_h */ diff --git a/dom/interfaces/base/nsIBrowser.idl b/dom/interfaces/base/nsIBrowser.idl index 300b09e13824..a9ff00e964b7 100644 --- a/dom/interfaces/base/nsIBrowser.idl +++ b/dom/interfaces/base/nsIBrowser.idl @@ -158,7 +158,8 @@ interface nsIBrowser : nsISupports in uint64_t aInnerWindowID, in boolean aHasRequestContextID, in uint64_t aRequestContextID, - in AString aContentType); + in AString aContentType, + in boolean aOnionUrlbarRewritesAllowed); /** * Called by Gecko when it wants to change the process which is currently diff --git a/dom/ipc/BrowserChild.cpp b/dom/ipc/BrowserChild.cpp index 2b17323d8a93..f72aa8faa11d 100644 --- a/dom/ipc/BrowserChild.cpp +++ b/dom/ipc/BrowserChild.cpp @@ -3645,6 +3645,8 @@ NS_IMETHODIMP BrowserChild::OnLocationChange(nsIWebProgress* aWebProgress, docShell->GetMayEnableCharacterEncodingMenu(); locationChangeData->charsetAutodetected() = docShell->GetCharsetAutodetected(); + locationChangeData->onionUrlbarRewritesAllowed() = + docShell->GetOnionUrlbarRewritesAllowed(); locationChangeData->contentPrincipal() = document->NodePrincipal(); locationChangeData->contentStoragePrincipal() = diff --git a/dom/ipc/BrowserParent.cpp b/dom/ipc/BrowserParent.cpp index 35d095f167c0..a5d9e08a3a7a 100644 --- a/dom/ipc/BrowserParent.cpp +++ b/dom/ipc/BrowserParent.cpp @@ -2698,7 +2698,8 @@ mozilla::ipc::IPCResult BrowserParent::RecvOnLocationChange( aWebProgressData->innerDOMWindowID(), aLocationChangeData->requestContextID().isSome(), aLocationChangeData->requestContextID().valueOr(0), - aLocationChangeData->contentType()); + aLocationChangeData->contentType(), + aLocationChangeData->onionUrlbarRewritesAllowed()); } Unused << managerAsListener->OnLocationChange(webProgress, request, aLocation, diff --git a/dom/ipc/PBrowser.ipdl b/dom/ipc/PBrowser.ipdl index 6a854fb6450a..51f89165ed71 100644 --- a/dom/ipc/PBrowser.ipdl +++ b/dom/ipc/PBrowser.ipdl @@ -142,6 +142,7 @@ struct WebProgressLocationChangeData bool isSyntheticDocument; bool mayEnableCharacterEncodingMenu; bool charsetAutodetected; + bool onionUrlbarRewritesAllowed; nsString contentType; nsString title; nsString charset; diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml index a821d80b6aa2..9e4e04360063 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -1077,6 +1077,12 @@ value: true mirror: always + # Whether rewriting the urlbar to a short .onion alias is allowed. +- name: browser.urlbar.onionRewrites.enabled + type: RelaxedAtomicBool + value: true + mirror: always + - name: browser.viewport.desktopWidth type: RelaxedAtomicInt32 value: 980 diff --git a/netwerk/ipc/DocumentLoadListener.cpp b/netwerk/ipc/DocumentLoadListener.cpp index 901ce11b57ca..988ec94a82d4 100644 --- a/netwerk/ipc/DocumentLoadListener.cpp +++ b/netwerk/ipc/DocumentLoadListener.cpp @@ -1856,6 +1856,16 @@ DocumentLoadListener::AsyncOnChannelRedirect( mLoadStateLoadType, nsIWebNavigation::LOAD_FLAGS_ALLOW_MIXED_CONTENT)); } + // Like the code above for allowing mixed content, we need to check this here + // in case the redirect is not handled in the docshell. + nsCOMPtr<nsIURI> oldURI, newURI; + aOldChannel->GetURI(getter_AddRefs(oldURI)); + aNewChannel->GetURI(getter_AddRefs(newURI)); + if (nsDocShell::IsTorOnionRedirect(oldURI, newURI)) { + mLoadStateLoadFlags |= + nsDocShell::INTERNAL_LOAD_FLAGS_ALLOW_ONION_URLBAR_REWRITES; + } + // We need the original URI of the current channel to use to open the real // channel in the content process. Unfortunately we overwrite the original // uri of the new channel with the original pre-redirect URI, so grab diff --git a/toolkit/content/widgets/browser-custom-element.js b/toolkit/content/widgets/browser-custom-element.js index 62a1ab1d6796..67fa1e5645c0 100644 --- a/toolkit/content/widgets/browser-custom-element.js +++ b/toolkit/content/widgets/browser-custom-element.js @@ -261,6 +261,8 @@ this._mayEnableCharacterEncodingMenu = null; + this._onionUrlbarRewritesAllowed = false; + this._charsetAutodetected = false; this._contentPrincipal = null; @@ -686,6 +688,12 @@ } } + get onionUrlbarRewritesAllowed() { + return this.isRemoteBrowser + ? this._onionUrlbarRewritesAllowed + : this.docShell.onionUrlbarRewritesAllowed; + } + get charsetAutodetected() { return this.isRemoteBrowser ? this._charsetAutodetected @@ -1292,7 +1300,8 @@ aInnerWindowID, aHaveRequestContextID, aRequestContextID, - aContentType + aContentType, + aOnionUrlbarRewritesAllowed ) { if (this.isRemoteBrowser && this.messageManager) { if (aCharset != null) { @@ -1316,6 +1325,7 @@ this._contentRequestContextID = aHaveRequestContextID ? aRequestContextID : null; + this._onionUrlbarRewritesAllowed = aOnionUrlbarRewritesAllowed; } } @@ -1708,6 +1718,7 @@ "_contentStoragePrincipal", "_isSyntheticDocument", "_innerWindowID", + "_onionUrlbarRewritesAllowed", ] ); } diff --git a/toolkit/modules/sessionstore/SessionHistory.jsm b/toolkit/modules/sessionstore/SessionHistory.jsm index 6c16ac331659..cc47f437824f 100644 --- a/toolkit/modules/sessionstore/SessionHistory.jsm +++ b/toolkit/modules/sessionstore/SessionHistory.jsm @@ -318,6 +318,7 @@ var SessionHistoryInternal = { } entry.persist = shEntry.persist; + entry.onionUrlbarRewritesAllowed = shEntry.onionUrlbarRewritesAllowed; return entry; }, @@ -601,6 +602,10 @@ var SessionHistoryInternal = { } } + if (entry.onionUrlbarRewritesAllowed) { + shEntry.onionUrlbarRewritesAllowed = entry.onionUrlbarRewritesAllowed; + } + return shEntry; },

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] fixup! Bug 28005: Implement .onion alias urlbar rewrites
by sysrqb＠torproject.org 31 Jul '20

31 Jul '20

commit fe116a5e95c29b914222d8cc41b44494dfc7c49d Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Jul 23 13:20:12 2020 +0200 fixup! Bug 28005: Implement .onion alias urlbar rewrites --- browser/base/content/browser.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 5d99785d5ec0..3f019c5f24c1 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -2248,7 +2248,7 @@ var gBrowserInit = { // [9]: allowInheritPrincipal (bool) // [10]: csp (nsIContentSecurityPolicy) // [11]: nsOpenWindowInfo - // [12]: onionUrlbarRewritesAllowed + // [12]: onionUrlbarRewritesAllowed (bool) let userContextId = window.arguments[5] != undefined ? window.arguments[5] @@ -5290,7 +5290,7 @@ var XULBrowserWindow = { // other parts of the code (like the bookmarks UI), so we save it. if (gBrowser.selectedBrowser.onionUrlbarRewritesAllowed) { gBrowser.selectedBrowser.currentOnionAliasURI = OnionAliasStore.getShortURI( - gBrowser.selectedBrowser.currentURI + aLocationURI ); } else { gBrowser.selectedBrowser.currentOnionAliasURI = null;

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] squash! Bug 4234: Use the Firefox Update Process for Tor Browser.
by sysrqb＠torproject.org 31 Jul '20

31 Jul '20

commit 2fa2abba5ec74a3cfef1a51ef545278248cea4a5 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 28 11:39:29 2020 -0400 squash! Bug 4234: Use the Firefox Update Process for Tor Browser. Use a localized string from Torbutton for the app menu's "Downloading update" message. This is a temporary fix that can be removed once Tor Browser is based on Firefox 79 or newer (at which point the localized string will be included in the Firefox language packs). --- .../customizableui/content/panelUI.inc.xhtml | 3 +-- .../components/customizableui/content/panelUI.js | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/browser/components/customizableui/content/panelUI.inc.xhtml b/browser/components/customizableui/content/panelUI.inc.xhtml index 5371c4f8b6c0..45f4a10ace7b 100644 --- a/browser/components/customizableui/content/panelUI.inc.xhtml +++ b/browser/components/customizableui/content/panelUI.inc.xhtml @@ -224,8 +224,7 @@ <vbox class="panel-subview-body"> <vbox id="appMenu-addon-banners"/> <toolbarbutton id="appMenu-update-banner" class="panel-banner-item" - data-l10n-id="appmenuitem-update-banner" - data-l10n-attrs="label-update-downloading" + label-update-downloading="Downloading update" label-update-available="&updateAvailable.panelUI.label;" label-update-manual="&updateManual.panelUI.label;" label-update-unsupported="&updateUnsupported.panelUI.label;" diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js index aa5cc7021f8e..97b6af51b22b 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js @@ -59,6 +59,7 @@ const PanelUI = { init() { this._initElements(); + this._initUpdaterStrings(); this.menuButton.addEventListener("mousedown", this); this.menuButton.addEventListener("keypress", this); @@ -147,6 +148,27 @@ const PanelUI = { } }, + _initUpdaterStrings() { + // If Torbutton is installed and enabled, replace the "Downloading update" + // string with one from torbutton.properties (to facilitate localization). + // This function can be removed when Tor Browser is based on Firefox 79 + // or newer (where the localized string is included in the Firefox + // language packs). + try { + let brands = Services.strings.createBundle( + "chrome://branding/locale/brand.properties"); + let stringArgs = [brands.GetStringFromName("brandShortName")]; + let torbuttonBundle = Services.strings.createBundle( + "chrome://torbutton/locale/torbutton.properties"); + let label = torbuttonBundle.formatStringFromName( + "updateDownloadingPanelUILabel", stringArgs, 1); + let elem = document.getElementById("appMenu-update-banner"); + if (elem) { + elem.setAttribute("label-update-downloading", label); + } + } catch (e) {} + }, + _eventListenersAdded: false, _ensureEventListenersAdded() { if (this._eventListenersAdded) {

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Bug 1642404 - add an option to show that an update is being downloaded r=bytesized, fluent-reviewers, flod
by sysrqb＠torproject.org 31 Jul '20

31 Jul '20

commit ddb2c1f75299dd016e5602b8cff40173e9bf02fb Author: Mark Smith <mcs(a)pearlcrescent.com> Date: Mon Jun 22 20:24:46 2020 +0000 Bug 1642404 - add an option to show that an update is being downloaded r=bytesized,fluent-reviewers,flod Add support for a hidden preference named app.update.notifyDuringDownload that, when set to true, causes a "Downloading update" message to appear in the app menu during a MAR download. Clicking the message opens the about box so the user can see detailed progress information. Differential Revision: https://phabricator.services.mozilla.com/D77688 --- browser/app/profile/firefox.js | 4 ++ browser/components/BrowserGlue.jsm | 1 + .../customizableui/content/panelUI.inc.xhtml | 2 + .../components/customizableui/content/panelUI.js | 5 ++ .../test/browser_panelUINotifications.js | 62 ++++++++++++++++++++++ browser/locales/en-US/browser/appmenu.ftl | 2 + .../themes/shared/customizableui/panelUI.inc.css | 3 ++ browser/themes/shared/notification-icons.inc.css | 1 + browser/themes/shared/toolbarbutton-icons.inc.css | 1 + toolkit/mozapps/update/UpdateListener.jsm | 50 +++++++++++------ toolkit/mozapps/update/UpdateService.jsm | 27 ++++++++++ .../mozapps/update/tests/browser/browser.bits.ini | 1 + toolkit/mozapps/update/tests/browser/browser.ini | 1 + .../update/tests/browser/browser.legacy.bits.ini | 1 + .../update/tests/browser/browser.legacy.ini | 1 + .../browser/browser_aboutDialog_bc_downloading.js | 17 ++++++ .../browser_aboutDialog_bc_downloading_notify.js | 58 ++++++++++++++++++++ toolkit/mozapps/update/tests/data/shared.js | 1 + 18 files changed, 222 insertions(+), 16 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index df3630b8c7f2..d3e50ab40666 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -127,6 +127,10 @@ pref("app.update.download.promptMaxAttempts", 2); // download a fresh installer. pref("app.update.elevation.promptMaxAttempts", 2); +// If set to true, a message will be displayed in the hamburger menu while +// an update is being downloaded. +pref("app.update.notifyDuringDownload", false); + // If set to true, the Update Service will automatically download updates if the // user can apply updates. pref("app.update.auto", true); diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 24828f4c0347..43565440dd17 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -780,6 +780,7 @@ const global = this; const listeners = { observers: { + "update-downloading": ["UpdateListener"], "update-staged": ["UpdateListener"], "update-downloaded": ["UpdateListener"], "update-available": ["UpdateListener"], diff --git a/browser/components/customizableui/content/panelUI.inc.xhtml b/browser/components/customizableui/content/panelUI.inc.xhtml index 27ef02cb3165..5371c4f8b6c0 100644 --- a/browser/components/customizableui/content/panelUI.inc.xhtml +++ b/browser/components/customizableui/content/panelUI.inc.xhtml @@ -224,6 +224,8 @@ <vbox class="panel-subview-body"> <vbox id="appMenu-addon-banners"/> <toolbarbutton id="appMenu-update-banner" class="panel-banner-item" + data-l10n-id="appmenuitem-update-banner" + data-l10n-attrs="label-update-downloading" label-update-available="&updateAvailable.panelUI.label;" label-update-manual="&updateManual.panelUI.label;" label-update-unsupported="&updateUnsupported.panelUI.label;" diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js index 9c10a73f063c..aa5cc7021f8e 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js @@ -65,6 +65,7 @@ const PanelUI = { Services.obs.addObserver(this, "fullscreen-nav-toolbox"); Services.obs.addObserver(this, "appMenu-notifications"); + Services.obs.addObserver(this, "show-update-progress"); XPCOMUtils.defineLazyPreferenceGetter( this, @@ -182,6 +183,7 @@ const PanelUI = { Services.obs.removeObserver(this, "fullscreen-nav-toolbox"); Services.obs.removeObserver(this, "appMenu-notifications"); + Services.obs.removeObserver(this, "show-update-progress"); window.removeEventListener("MozDOMFullscreen:Entered", this); window.removeEventListener("MozDOMFullscreen:Exited", this); @@ -271,6 +273,9 @@ const PanelUI = { this._notifications = AppMenuNotifications.notifications; this._updateNotifications(true); break; + case "show-update-progress": + openAboutDialog(); + break; } }, diff --git a/browser/components/customizableui/test/browser_panelUINotifications.js b/browser/components/customizableui/test/browser_panelUINotifications.js index 39ae5435c453..cab471bc946f 100644 --- a/browser/components/customizableui/test/browser_panelUINotifications.js +++ b/browser/components/customizableui/test/browser_panelUINotifications.js @@ -156,6 +156,68 @@ add_task(async function testSecondaryActionWorkflow() { }); }); +/** + * This tests that the PanelUI update downloading badge and banner + * notification are correctly displayed and that clicking the banner + * item calls the main action. + */ +add_task(async function testDownloadingBadge() { + let options = { + gBrowser: window.gBrowser, + url: "about:blank", + }; + + await BrowserTestUtils.withNewTab(options, async function(browser) { + let mainActionCalled = false; + let mainAction = { + callback: () => { + mainActionCalled = true; + }, + }; + // The downloading notification is always displayed in a dismissed state. + AppMenuNotifications.showNotification( + "update-downloading", + mainAction, + undefined, + { dismissed: true } + ); + is(PanelUI.notificationPanel.state, "closed", "doorhanger is closed."); + + is( + PanelUI.menuButton.getAttribute("badge-status"), + "update-downloading", + "Downloading badge is displaying on PanelUI button." + ); + + await gCUITestUtils.openMainMenu(); + isnot( + PanelUI.menuButton.getAttribute("badge-status"), + "update-downloading", + "Downloading badge is hidden on PanelUI button." + ); + let menuItem = PanelUI.mainView.querySelector(".panel-banner-item"); + is( + menuItem.label, + menuItem.getAttribute("label-update-downloading"), + "Showing correct label (downloading)" + ); + is(menuItem.hidden, false, "update-downloading menu item is showing."); + + await gCUITestUtils.hideMainMenu(); + is( + PanelUI.menuButton.getAttribute("badge-status"), + "update-downloading", + "Downloading badge is shown on PanelUI button." + ); + + await gCUITestUtils.openMainMenu(); + menuItem.click(); + ok(mainActionCalled, "Main action callback was called"); + + AppMenuNotifications.removeNotification(/.*/); + }); +}); + /** * We want to ensure a few things with this: * - Adding a doorhanger will make a badge disappear diff --git a/browser/locales/en-US/browser/appmenu.ftl b/browser/locales/en-US/browser/appmenu.ftl index 12fd2bec3e6a..3026b2597287 100644 --- a/browser/locales/en-US/browser/appmenu.ftl +++ b/browser/locales/en-US/browser/appmenu.ftl @@ -4,6 +4,8 @@ ## App Menu +appmenuitem-update-banner = + .label-update-downloading = Downloading { -brand-shorter-name } update appmenuitem-protection-dashboard-title = Protections Dashboard appmenuitem-customize-mode = .label = Customize… diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index 8a24f03c0ad6..c991daee0759 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -67,6 +67,7 @@ } #PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, +#PanelUI-menu-button[badge-status="update-downloading"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-unsupported"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { @@ -80,6 +81,7 @@ } #PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, +#PanelUI-menu-button[badge-status="update-downloading"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; @@ -90,6 +92,7 @@ } .panel-banner-item[notificationid="update-available"]::after, +.panel-banner-item[notificationid="update-downloading"]::after, .panel-banner-item[notificationid="update-manual"]::after, .panel-banner-item[notificationid="update-restart"]::after { background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css index 94e3f760a122..7aa92d51f4d6 100644 --- a/browser/themes/shared/notification-icons.inc.css +++ b/browser/themes/shared/notification-icons.inc.css @@ -404,6 +404,7 @@ html|*#webRTC-previewVideo { /* UPDATE */ .popup-notification-icon[popupid="update-available"], +.popup-notification-icon[popupid="update-downloading"], .popup-notification-icon[popupid="update-manual"], .popup-notification-icon[popupid="update-restart"] { background: #74BF43 url(chrome://browser/skin/notification-icons/update.svg) no-repeat center; diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css b/browser/themes/shared/toolbarbutton-icons.inc.css index 5856fa2dc28f..cf02f871c9a4 100644 --- a/browser/themes/shared/toolbarbutton-icons.inc.css +++ b/browser/themes/shared/toolbarbutton-icons.inc.css @@ -298,6 +298,7 @@ toolbar[brighttext] { } #PanelUI-menu-button[badge-status="update-available"], +#PanelUI-menu-button[badge-status="update-downloading"], #PanelUI-menu-button[badge-status="update-manual"], #PanelUI-menu-button[badge-status="update-restart"] { list-style-image: url("chrome://browser/skin/menu-badged.svg"); diff --git a/toolkit/mozapps/update/UpdateListener.jsm b/toolkit/mozapps/update/UpdateListener.jsm index 17919e914b11..110640628771 100644 --- a/toolkit/mozapps/update/UpdateListener.jsm +++ b/toolkit/mozapps/update/UpdateListener.jsm @@ -113,16 +113,18 @@ var UpdateListener = { mainAction, beforeShowDoorhanger ) { + const addTelemetry = id => { + // No telemetry for the "downloading" state. + if (type !== "downloading") { + Services.telemetry.getHistogramById(id).add(type); + } + }; let action = { callback(win, fromDoorhanger) { if (fromDoorhanger) { - Services.telemetry - .getHistogramById("UPDATE_NOTIFICATION_MAIN_ACTION_DOORHANGER") - .add(type); + addTelemetry("UPDATE_NOTIFICATION_MAIN_ACTION_DOORHANGER"); } else { - Services.telemetry - .getHistogramById("UPDATE_NOTIFICATION_MAIN_ACTION_MENU") - .add(type); + addTelemetry("UPDATE_NOTIFICATION_MAIN_ACTION_MENU"); } mainAction(win); }, @@ -131,13 +133,10 @@ var UpdateListener = { let secondaryAction = { callback() { - Services.telemetry - .getHistogramById("UPDATE_NOTIFICATION_DISMISSED") - .add(type); + addTelemetry("UPDATE_NOTIFICATION_DISMISSED"); }, dismiss: true, }; - AppMenuNotifications.showNotification( "update-" + type, action, @@ -145,13 +144,9 @@ var UpdateListener = { { dismissed, beforeShowDoorhanger } ); if (dismissed) { - Services.telemetry - .getHistogramById("UPDATE_NOTIFICATION_BADGE_SHOWN") - .add(type); + addTelemetry("UPDATE_NOTIFICATION_BADGE_SHOWN"); } else { - Services.telemetry - .getHistogramById("UPDATE_NOTIFICATION_SHOWN") - .add(type); + addTelemetry("UPDATE_NOTIFICATION_SHOWN"); } }, @@ -205,6 +200,15 @@ var UpdateListener = { } }, + showUpdateDownloadingNotification() { + this.showUpdateNotification("downloading", true, true, () => { + // The user clicked on the "Downloading update" app menu item. + // Code in browser/components/customizableui/content/panelUI.js + // receives the following notification and opens the about dialog. + Services.obs.notifyObservers(null, "show-update-progress"); + }); + }, + handleUpdateError(update, status) { switch (status) { case "download-attempt-failed": @@ -287,6 +291,17 @@ var UpdateListener = { } }, + handleUpdateDownloading(status) { + switch (status) { + case "downloading": + this.showUpdateDownloadingNotification(); + break; + case "idle": + this.reset(); + break; + } + }, + observe(subject, topic, status) { let update = subject && subject.QueryInterface(Ci.nsIUpdate); @@ -299,6 +314,9 @@ var UpdateListener = { } this.handleUpdateAvailable(update, status); break; + case "update-downloading": + this.handleUpdateDownloading(status); + break; case "update-staged": case "update-downloaded": // An update check has found an update and downloaded / staged the diff --git a/toolkit/mozapps/update/UpdateService.jsm b/toolkit/mozapps/update/UpdateService.jsm index 9fe676a529aa..2c231486714c 100644 --- a/toolkit/mozapps/update/UpdateService.jsm +++ b/toolkit/mozapps/update/UpdateService.jsm @@ -63,6 +63,7 @@ const PREF_APP_UPDATE_ELEVATE_ATTEMPTS = "app.update.elevate.attempts"; const PREF_APP_UPDATE_ELEVATE_MAXATTEMPTS = "app.update.elevate.maxAttempts"; const PREF_APP_UPDATE_LOG = "app.update.log"; const PREF_APP_UPDATE_LOG_FILE = "app.update.log.file"; +const PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD = "app.update.notifyDuringDownload"; const PREF_APP_UPDATE_PROMPTWAITTIME = "app.update.promptWaitTime"; const PREF_APP_UPDATE_SERVICE_ENABLED = "app.update.service.enabled"; const PREF_APP_UPDATE_SERVICE_ERRORS = "app.update.service.errors"; @@ -4614,6 +4615,24 @@ Downloader.prototype = { return selectedPatch; }, + /** + * Whether or not the user wants to be notified that an update is being + * downloaded. + */ + get _notifyDuringDownload() { + return Services.prefs.getBoolPref( + PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD, + false + ); + }, + + _notifyDownloadStatusObservers: function Downloader_notifyDownloadStatusObservers() { + if (this._notifyDuringDownload) { + let status = this.updateService.isDownloading ? "downloading" : "idle"; + Services.obs.notifyObservers(this._update, "update-downloading", status); + } + }, + /** * Whether or not we are currently downloading something. */ @@ -4855,6 +4874,9 @@ Downloader.prototype = { .getService(Ci.nsIUpdateManager) .saveUpdates(); } + + this._notifyDownloadStatusObservers(); + return STATE_DOWNLOADING; }, @@ -5367,6 +5389,11 @@ Downloader.prototype = { this._request = null; + // This notification must happen after _request is set to null so that + // the correct this.updateService.isDownloading value is available in + // _notifyDownloadStatusObservers(). + this._notifyDownloadStatusObservers(); + if (state == STATE_DOWNLOAD_FAILED) { var allFailed = true; // If we haven't already, attempt to download without BITS diff --git a/toolkit/mozapps/update/tests/browser/browser.bits.ini b/toolkit/mozapps/update/tests/browser/browser.bits.ini index 9355e22550f2..5a44d1e0f6bf 100644 --- a/toolkit/mozapps/update/tests/browser/browser.bits.ini +++ b/toolkit/mozapps/update/tests/browser/browser.bits.ini @@ -21,6 +21,7 @@ prefs = # About Dialog Application Update Tests [browser_aboutDialog_bc_downloading.js] [browser_aboutDialog_bc_downloading_staging.js] +[browser_aboutDialog_bc_downloading_notify.js] [browser_aboutDialog_bc_downloaded.js] [browser_aboutDialog_bc_downloaded_staging.js] [browser_aboutDialog_bc_downloaded_staged.js] diff --git a/toolkit/mozapps/update/tests/browser/browser.ini b/toolkit/mozapps/update/tests/browser/browser.ini index 5ce14c9c2633..c4f3fd055bbf 100644 --- a/toolkit/mozapps/update/tests/browser/browser.ini +++ b/toolkit/mozapps/update/tests/browser/browser.ini @@ -15,6 +15,7 @@ prefs = # About Dialog Application Update Tests [browser_aboutDialog_bc_downloading.js] [browser_aboutDialog_bc_downloading_staging.js] +[browser_aboutDialog_bc_downloading_notify.js] [browser_aboutDialog_bc_downloaded.js] [browser_aboutDialog_bc_downloaded_staging.js] [browser_aboutDialog_bc_downloaded_stagingFailure.js] diff --git a/toolkit/mozapps/update/tests/browser/browser.legacy.bits.ini b/toolkit/mozapps/update/tests/browser/browser.legacy.bits.ini index 7bf1f706a5b7..555eaea82cd6 100644 --- a/toolkit/mozapps/update/tests/browser/browser.legacy.bits.ini +++ b/toolkit/mozapps/update/tests/browser/browser.legacy.bits.ini @@ -20,6 +20,7 @@ prefs = # About Dialog Application Update Tests [browser_aboutDialog_bc_downloading.js] [browser_aboutDialog_bc_downloading_staging.js] +[browser_aboutDialog_bc_downloading_notify.js] [browser_aboutDialog_bc_downloaded.js] [browser_aboutDialog_bc_downloaded_staging.js] [browser_aboutDialog_bc_downloaded_staged.js] diff --git a/toolkit/mozapps/update/tests/browser/browser.legacy.ini b/toolkit/mozapps/update/tests/browser/browser.legacy.ini index 0cf61d64f42e..e3f681f53236 100644 --- a/toolkit/mozapps/update/tests/browser/browser.legacy.ini +++ b/toolkit/mozapps/update/tests/browser/browser.legacy.ini @@ -14,6 +14,7 @@ prefs = # About Dialog Application Update Tests [browser_aboutDialog_bc_downloading.js] [browser_aboutDialog_bc_downloading_staging.js] +[browser_aboutDialog_bc_downloading_notify.js] [browser_aboutDialog_bc_downloaded.js] [browser_aboutDialog_bc_downloaded_staging.js] [browser_aboutDialog_bc_downloaded_stagingFailure.js] diff --git a/toolkit/mozapps/update/tests/browser/browser_aboutDialog_bc_downloading.js b/toolkit/mozapps/update/tests/browser/browser_aboutDialog_bc_downloading.js index 776d637512ad..67ddd65205da 100644 --- a/toolkit/mozapps/update/tests/browser/browser_aboutDialog_bc_downloading.js +++ b/toolkit/mozapps/update/tests/browser/browser_aboutDialog_bc_downloading.js @@ -6,6 +6,10 @@ // Test for About Dialog background check for updates // with the About Dialog opened during downloading. add_task(async function aboutDialog_backgroundCheck_downloading() { + await SpecialPowers.pushPrefEnv({ + set: [[PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD, false]], + }); + let downloadInfo = []; if (Services.prefs.getBoolPref(PREF_APP_UPDATE_BITS_ENABLED)) { downloadInfo[0] = { patchType: "partial", bitsResult: "0" }; @@ -21,6 +25,17 @@ add_task(async function aboutDialog_backgroundCheck_downloading() { waitForUpdateState: STATE_DOWNLOADING, }; await runAboutDialogUpdateTest(params, [ + async function aboutDialog_downloading() { + is( + PanelUI.notificationPanel.state, + "closed", + "The window's doorhanger is closed." + ); + ok( + !PanelUI.menuButton.hasAttribute("badge-status"), + "The window does not have a badge." + ); + }, { panelId: "downloading", checkActiveUpdate: { state: STATE_DOWNLOADING }, @@ -33,4 +48,6 @@ add_task(async function aboutDialog_backgroundCheck_downloading() { continueFile: null, }, ]); + + await SpecialPowers.popPrefEnv(); }); diff --git a/toolkit/mozapps/update/tests/browser/browser_aboutDialog_bc_downloading_notify.js b/toolkit/mozapps/update/tests/browser/browser_aboutDialog_bc_downloading_notify.js new file mode 100644 index 000000000000..cf427b149a54 --- /dev/null +++ b/toolkit/mozapps/update/tests/browser/browser_aboutDialog_bc_downloading_notify.js @@ -0,0 +1,58 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +// Test for About Dialog background check for updates with the +// "notify during download" feature turned on. +add_task(async function aboutDialog_backgroundCheck_downloading_notify() { + await SpecialPowers.pushPrefEnv({ + set: [[PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD, true]], + }); + + let downloadInfo = []; + if (Services.prefs.getBoolPref(PREF_APP_UPDATE_BITS_ENABLED)) { + downloadInfo[0] = { patchType: "partial", bitsResult: "0" }; + } else { + downloadInfo[0] = { patchType: "partial", internalResult: "0" }; + } + + // Since the partial should be successful specify an invalid size for the + // complete update. + let params = { + queryString: "&useSlowDownloadMar=1&invalidCompleteSize=1", + backgroundUpdate: true, + waitForUpdateState: STATE_DOWNLOADING, + }; + await runAboutDialogUpdateTest(params, [ + async function aboutDialog_downloading_notification() { + is( + PanelUI.notificationPanel.state, + "closed", + "The window's doorhanger is closed." + ); + ok( + PanelUI.menuButton.hasAttribute("badge-status"), + "The window has a badge." + ); + is( + PanelUI.menuButton.getAttribute("badge-status"), + "update-downloading", + "The downloading badge is showing for the background window" + ); + }, + { + panelId: "downloading", + checkActiveUpdate: { state: STATE_DOWNLOADING }, + continueFile: CONTINUE_DOWNLOAD, + downloadInfo, + }, + { + panelId: "apply", + checkActiveUpdate: { state: STATE_PENDING }, + continueFile: null, + }, + ]); + + await SpecialPowers.popPrefEnv(); +}); diff --git a/toolkit/mozapps/update/tests/data/shared.js b/toolkit/mozapps/update/tests/data/shared.js index 51d9de99d7f2..5106aa5fc7a2 100644 --- a/toolkit/mozapps/update/tests/data/shared.js +++ b/toolkit/mozapps/update/tests/data/shared.js @@ -40,6 +40,7 @@ const PREF_APP_UPDATE_INTERVAL = "app.update.interval"; const PREF_APP_UPDATE_LASTUPDATETIME = "app.update.lastUpdateTime.background-update-timer"; const PREF_APP_UPDATE_LOG = "app.update.log"; +const PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD = "app.update.notifyDuringDownload"; const PREF_APP_UPDATE_PROMPTWAITTIME = "app.update.promptWaitTime"; const PREF_APP_UPDATE_RETRYTIMEOUT = "app.update.socket.retryTimeout"; const PREF_APP_UPDATE_SERVICE_ENABLED = "app.update.service.enabled";

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Bug 1642754 - Update prompts should not depend on how update was initiated r=bytesized
by sysrqb＠torproject.org 31 Jul '20

31 Jul '20

commit 37b15a69f8c1e93bfb52935c4151e679ea0e1115 Author: Mark Smith <mcs(a)pearlcrescent.com> Date: Wed Jun 17 19:24:09 2020 +0000 Bug 1642754 - Update prompts should not depend on how update was initiated r=bytesized Show update badge and doorhanger when entering the "pending" state for foreground updates. Differential Revision: https://phabricator.services.mozilla.com/D79903 --- toolkit/mozapps/update/UpdateService.jsm | 10 ++-------- .../browser/browser_aboutDialog_fc_downloadAuto.js | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/toolkit/mozapps/update/UpdateService.jsm b/toolkit/mozapps/update/UpdateService.jsm index 2c231486714c..93a6ee81c295 100644 --- a/toolkit/mozapps/update/UpdateService.jsm +++ b/toolkit/mozapps/update/UpdateService.jsm @@ -5176,8 +5176,6 @@ Downloader.prototype = { } } - // XXX ehsan shouldShowPrompt should always be false here. - // But what happens when there is already a UI showing? var state = this._patch.state; var shouldShowPrompt = false; var shouldRegisterOnlineObserver = false; @@ -5218,9 +5216,7 @@ Downloader.prototype = { } else { state = STATE_PENDING; } - if (this.background) { - shouldShowPrompt = !getCanStageUpdates(); - } + shouldShowPrompt = !getCanStageUpdates(); AUSTLMY.pingDownloadCode(this.isCompleteUpdate, AUSTLMY.DWNLD_SUCCESS); // Tell the updater.exe we're ready to apply. @@ -5503,9 +5499,7 @@ Downloader.prototype = { LOG( "Downloader:onStopRequest - failed to stage update. Exception: " + e ); - if (this.background) { - shouldShowPrompt = true; - } + shouldShowPrompt = true; } } } diff --git a/toolkit/mozapps/update/tests/browser/browser_aboutDialog_fc_downloadAuto.js b/toolkit/mozapps/update/tests/browser/browser_aboutDialog_fc_downloadAuto.js index 6a8835251dec..be65ce8ddef1 100644 --- a/toolkit/mozapps/update/tests/browser/browser_aboutDialog_fc_downloadAuto.js +++ b/toolkit/mozapps/update/tests/browser/browser_aboutDialog_fc_downloadAuto.js @@ -15,7 +15,7 @@ add_task(async function aboutDialog_foregroundCheck_downloadAuto() { // Since the partial should be successful specify an invalid size for the // complete update. - let params = { queryString: "&invalidCompleteSize=1" }; + let params = { queryString: "&invalidCompleteSize=1&promptWaitTime=0" }; await runAboutDialogUpdateTest(params, [ { panelId: "checkingForUpdates", @@ -28,6 +28,22 @@ add_task(async function aboutDialog_foregroundCheck_downloadAuto() { continueFile: CONTINUE_DOWNLOAD, downloadInfo, }, + async function aboutDialog_restart_notification() { + is( + PanelUI.notificationPanel.state, + "closed", + "The window's doorhanger is closed." + ); + ok( + PanelUI.menuButton.hasAttribute("badge-status"), + "The window has a badge." + ); + is( + PanelUI.menuButton.getAttribute("badge-status"), + "update-restart", + "The restart badge is showing for the background window" + ); + }, { panelId: "apply", checkActiveUpdate: { state: STATE_PENDING },

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Merge remote-tracking branch 'bradegl/bug40040-02' into tor-browser-78.0.1esr-10.0-1
by sysrqb＠torproject.org 31 Jul '20

31 Jul '20

commit 3d5d9212e1f4ce272ef6a5a75459a7120e984b4e Merge: 24dceb653768 2fa2abba5ec7 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Jul 31 15:17:22 2020 +0000 Merge remote-tracking branch 'bradegl/bug40040-02' into tor-browser-78.0.1esr-10.0-1 browser/app/profile/firefox.js | 4 ++ .../customizableui/content/panelUI.inc.xhtml | 2 +- .../components/customizableui/content/panelUI.js | 13 +++-- .../test/browser_panelUINotifications.js | 62 ++++++++++++++++++++++ browser/locales/en-US/browser/appmenu.ftl | 2 + toolkit/mozapps/update/UpdateListener.jsm | 29 +++++----- toolkit/mozapps/update/UpdateService.jsm | 39 ++++++-------- .../mozapps/update/tests/browser/browser.bits.ini | 1 + toolkit/mozapps/update/tests/browser/browser.ini | 1 + .../update/tests/browser/browser.legacy.bits.ini | 1 + .../update/tests/browser/browser.legacy.ini | 1 + .../browser/browser_aboutDialog_bc_downloading.js | 17 ++++++ .../browser_aboutDialog_bc_downloading_notify.js | 58 ++++++++++++++++++++ .../browser/browser_aboutDialog_fc_downloadAuto.js | 18 ++++++- toolkit/mozapps/update/tests/data/shared.js | 1 + 15 files changed, 200 insertions(+), 49 deletions(-)

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] squash! Bug 4234: Use the Firefox Update Process for Tor Browser.
by sysrqb＠torproject.org 31 Jul '20

31 Jul '20

commit 9edbe737efc9625c3ada0d94a301a976c8417176 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 28 10:12:43 2020 -0400 squash! Bug 4234: Use the Firefox Update Process for Tor Browser. Removed #28885 parts of this patch which have been uplifted to Firefox. --- browser/components/BrowserGlue.jsm | 1 - .../customizableui/content/panelUI.inc.xhtml | 1 - .../components/customizableui/content/panelUI.js | 28 ---------------------- .../themes/shared/customizableui/panelUI.inc.css | 3 --- browser/themes/shared/notification-icons.inc.css | 1 - browser/themes/shared/toolbarbutton-icons.inc.css | 1 - toolkit/mozapps/update/UpdateListener.jsm | 23 ------------------ toolkit/mozapps/update/UpdateService.jsm | 28 ---------------------- 8 files changed, 86 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 43565440dd17..24828f4c0347 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -780,7 +780,6 @@ const global = this; const listeners = { observers: { - "update-downloading": ["UpdateListener"], "update-staged": ["UpdateListener"], "update-downloaded": ["UpdateListener"], "update-available": ["UpdateListener"], diff --git a/browser/components/customizableui/content/panelUI.inc.xhtml b/browser/components/customizableui/content/panelUI.inc.xhtml index 80a015021d3b..27ef02cb3165 100644 --- a/browser/components/customizableui/content/panelUI.inc.xhtml +++ b/browser/components/customizableui/content/panelUI.inc.xhtml @@ -225,7 +225,6 @@ <vbox id="appMenu-addon-banners"/> <toolbarbutton id="appMenu-update-banner" class="panel-banner-item" label-update-available="&updateAvailable.panelUI.label;" - label-update-downloading="Downloading update" label-update-manual="&updateManual.panelUI.label;" label-update-unsupported="&updateUnsupported.panelUI.label;" label-update-restart="&updateRestart.panelUI.label2;" diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js index e63f004e7fc3..9c10a73f063c 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js @@ -59,14 +59,12 @@ const PanelUI = { init() { this._initElements(); - this._initUpdaterStrings(); this.menuButton.addEventListener("mousedown", this); this.menuButton.addEventListener("keypress", this); Services.obs.addObserver(this, "fullscreen-nav-toolbox"); Services.obs.addObserver(this, "appMenu-notifications"); - Services.obs.addObserver(this, "show-update-progress"); XPCOMUtils.defineLazyPreferenceGetter( this, @@ -148,28 +146,6 @@ const PanelUI = { } }, - _initUpdaterStrings() { - // If Torbutton is installed and enabled, replace the "Downloading update" - // string with one from torbutton.properties (to facilitate localization). - try { - let brands = Services.strings.createBundle( - "chrome://branding/locale/brand.properties"); - let stringArgs = [brands.GetStringFromName("brandShortName")]; - let torbuttonBundle = Services.strings.createBundle( - "chrome://torbutton/locale/torbutton.properties"); - let label = torbuttonBundle.formatStringFromName( - "updateDownloadingPanelUILabel", stringArgs, 1); - let attrName = "label-update-downloading"; - let elements = document.getElementsByClassName("panel-banner-item"); - for (let i = 0; i < elements.length; ++i) { - let elem = elements.item(i); - if (elem.hasAttribute(attrName)) { - elem.setAttribute(attrName, label); - } - } - } catch (e) {} - }, - _eventListenersAdded: false, _ensureEventListenersAdded() { if (this._eventListenersAdded) { @@ -206,7 +182,6 @@ const PanelUI = { Services.obs.removeObserver(this, "fullscreen-nav-toolbox"); Services.obs.removeObserver(this, "appMenu-notifications"); - Services.obs.removeObserver(this, "show-update-progress"); window.removeEventListener("MozDOMFullscreen:Entered", this); window.removeEventListener("MozDOMFullscreen:Exited", this); @@ -296,9 +271,6 @@ const PanelUI = { this._notifications = AppMenuNotifications.notifications; this._updateNotifications(true); break; - case "show-update-progress": - openAboutDialog(); - break; } }, diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index c991daee0759..8a24f03c0ad6 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -67,7 +67,6 @@ } #PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, -#PanelUI-menu-button[badge-status="update-downloading"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-unsupported"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { @@ -81,7 +80,6 @@ } #PanelUI-menu-button[badge-status="update-available"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, -#PanelUI-menu-button[badge-status="update-downloading"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-manual"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="update-restart"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; @@ -92,7 +90,6 @@ } .panel-banner-item[notificationid="update-available"]::after, -.panel-banner-item[notificationid="update-downloading"]::after, .panel-banner-item[notificationid="update-manual"]::after, .panel-banner-item[notificationid="update-restart"]::after { background: #74BF43 url(chrome://browser/skin/update-badge.svg) no-repeat center; diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css index 7aa92d51f4d6..94e3f760a122 100644 --- a/browser/themes/shared/notification-icons.inc.css +++ b/browser/themes/shared/notification-icons.inc.css @@ -404,7 +404,6 @@ html|*#webRTC-previewVideo { /* UPDATE */ .popup-notification-icon[popupid="update-available"], -.popup-notification-icon[popupid="update-downloading"], .popup-notification-icon[popupid="update-manual"], .popup-notification-icon[popupid="update-restart"] { background: #74BF43 url(chrome://browser/skin/notification-icons/update.svg) no-repeat center; diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css b/browser/themes/shared/toolbarbutton-icons.inc.css index cf02f871c9a4..5856fa2dc28f 100644 --- a/browser/themes/shared/toolbarbutton-icons.inc.css +++ b/browser/themes/shared/toolbarbutton-icons.inc.css @@ -298,7 +298,6 @@ toolbar[brighttext] { } #PanelUI-menu-button[badge-status="update-available"], -#PanelUI-menu-button[badge-status="update-downloading"], #PanelUI-menu-button[badge-status="update-manual"], #PanelUI-menu-button[badge-status="update-restart"] { list-style-image: url("chrome://browser/skin/menu-badged.svg"); diff --git a/toolkit/mozapps/update/UpdateListener.jsm b/toolkit/mozapps/update/UpdateListener.jsm index c788af8862e6..17919e914b11 100644 --- a/toolkit/mozapps/update/UpdateListener.jsm +++ b/toolkit/mozapps/update/UpdateListener.jsm @@ -205,15 +205,6 @@ var UpdateListener = { } }, - showUpdateDownloadingNotification() { - this.showUpdateNotification("downloading", true, true, () => { - // The user clicked on the "Downloading update" app menu item. - // Code in browser/components/customizableui/content/panelUI.js - // receives the following notification and opens the about dialog. - Services.obs.notifyObservers(null, "show-update-progress", null); - }); - }, - handleUpdateError(update, status) { switch (status) { case "download-attempt-failed": @@ -296,17 +287,6 @@ var UpdateListener = { } }, - handleUpdateDownloading(status) { - switch (status) { - case "downloading": - this.showUpdateDownloadingNotification(); - break; - case "idle": - this.reset(); - break; - } - }, - observe(subject, topic, status) { let update = subject && subject.QueryInterface(Ci.nsIUpdate); @@ -319,9 +299,6 @@ var UpdateListener = { } this.handleUpdateAvailable(update, status); break; - case "update-downloading": - this.handleUpdateDownloading(status); - break; case "update-staged": case "update-downloaded": // An update check has found an update and downloaded / staged the diff --git a/toolkit/mozapps/update/UpdateService.jsm b/toolkit/mozapps/update/UpdateService.jsm index 15e06940f8e7..9fe676a529aa 100644 --- a/toolkit/mozapps/update/UpdateService.jsm +++ b/toolkit/mozapps/update/UpdateService.jsm @@ -63,7 +63,6 @@ const PREF_APP_UPDATE_ELEVATE_ATTEMPTS = "app.update.elevate.attempts"; const PREF_APP_UPDATE_ELEVATE_MAXATTEMPTS = "app.update.elevate.maxAttempts"; const PREF_APP_UPDATE_LOG = "app.update.log"; const PREF_APP_UPDATE_LOG_FILE = "app.update.log.file"; -const PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD = "app.update.notifyDuringDownload"; const PREF_APP_UPDATE_PROMPTWAITTIME = "app.update.promptWaitTime"; const PREF_APP_UPDATE_SERVICE_ENABLED = "app.update.service.enabled"; const PREF_APP_UPDATE_SERVICE_ERRORS = "app.update.service.errors"; @@ -4396,13 +4395,11 @@ Downloader.prototype = { // retrying after a failed cancel is not an error, so we will set the // cancel promise to null in the failure case. this._cancelPromise = null; - this._notifyDownloadStatusObservers(); throw e; } } else if (this._request && this._request instanceof Ci.nsIRequest) { this._request.cancel(cancelError); } - this._notifyDownloadStatusObservers(); }, /** @@ -4617,13 +4614,6 @@ Downloader.prototype = { return selectedPatch; }, - _notifyDownloadStatusObservers: function Downloader_notifyDownloadStatusObservers() { - if (Services.prefs.getBoolPref(PREF_APP_UPDATE_NOTIFYDURINGDOWNLOAD, false)) { - let status = this.updateService.isDownloading ? "downloading" : "idle"; - Services.obs.notifyObservers(this._update, "update-downloading", status); - } - }, - /** * Whether or not we are currently downloading something. */ @@ -4865,9 +4855,6 @@ Downloader.prototype = { .getService(Ci.nsIUpdateManager) .saveUpdates(); } - - this._notifyDownloadStatusObservers(); - return STATE_DOWNLOADING; }, @@ -5209,16 +5196,9 @@ Downloader.prototype = { } else { state = STATE_PENDING; } -#if defined(TOR_BROWSER_UPDATE) - // In Tor Browser, show update-related messages in the hamburger menu - // even if the update was started in the foreground, e.g., from the - // about box. - shouldShowPrompt = !getCanStageUpdates(); -#else if (this.background) { shouldShowPrompt = !getCanStageUpdates(); } -#endif AUSTLMY.pingDownloadCode(this.isCompleteUpdate, AUSTLMY.DWNLD_SUCCESS); // Tell the updater.exe we're ready to apply. @@ -5386,7 +5366,6 @@ Downloader.prototype = { } this._request = null; - this._notifyDownloadStatusObservers(); if (state == STATE_DOWNLOAD_FAILED) { var allFailed = true; @@ -5497,16 +5476,9 @@ Downloader.prototype = { LOG( "Downloader:onStopRequest - failed to stage update. Exception: " + e ); -#if defined(TOR_BROWSER_UPDATE) - // In Tor Browser, show update-related messages in the hamburger menu - // even if the update was started in the foreground, e.g., from the - // about box. - shouldShowPrompt = true; -#else if (this.background) { shouldShowPrompt = true; } -#endif } } }

1 0

[tor-browser-build/master] Bug 40027: Fix incremental .mar creation for esr78
by sysrqb＠torproject.org 30 Jul '20

30 Jul '20

commit 8f114d54cc6a7c8f3a66c59512cb5f8f1f381714 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 23 10:42:19 2020 +0000 Bug 40027: Fix incremental .mar creation for esr78 --- tools/update-responses/update_responses | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 6b25435..de703ee 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -190,7 +190,7 @@ sub mar_filename { } sub create_incremental_mar { - my ($config, $pm, $from_version, $new_version, $os, $lang) = @_; + my ($config, $pm, $from_version, $new_version, $os, $lang, $channel) = @_; my $appname = $config->{appname_marfile}; my $mar_file = "$appname-$os-${from_version}-${new_version}_$lang.incremental.mar"; my $mar_file_path = version_dir($config, $new_version) . '/' . $mar_file; @@ -230,6 +230,8 @@ sub create_incremental_mar { exit_error "Missing code signature while creating $mar_file"; } } + $ENV{MOZ_PRODUCT_VERSION} = $new_version; + $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; my ($out, $err, $success) = capture_exec('make_incremental_update.sh', $mar_file_path, "$tmpdir/A", "$tmpdir/B"); if (!$success) { @@ -240,7 +242,7 @@ sub create_incremental_mar { } sub create_incremental_mars_for_version { - my ($config, $version) = @_; + my ($config, $version, $channel) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish(sub { $_[2]->(@_) }); my $v = $config->{versions}{$version}; @@ -251,7 +253,7 @@ sub create_incremental_mars_for_version { foreach my $os (keys %{$v->{files}}) { foreach my $lang (keys %{$v->{files}{$os}}) { next unless defined $from_v->{files}{$os}{$lang}{complete}; - create_incremental_mar($config, $pm, $from_version, $version, $os, $lang); + create_incremental_mar($config, $pm, $from_version, $version, $os, $lang, $channel); } } } @@ -640,10 +642,11 @@ my %actions = ( }, gen_incrementals => sub { my ($config) = @_; - foreach my $version (channel_to_version($config, @ARGV)) { + foreach my $channel (@ARGV) { + my ($version) = channel_to_version($config, $channel); extract_martools($config, $version); get_version_files($config, $version); - create_incremental_mars_for_version($config, $version); + create_incremental_mars_for_version($config, $version, $channel); } }, download_missing_versions => sub {

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40028'
by sysrqb＠torproject.org 25 Jul '20

25 Jul '20

commit 7737b940a9ce4e35cdb38b38b31b67adb5049d3b Merge: f60b9ea 2a9d74c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sat Jul 25 16:18:25 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40028' projects/tor-browser/build | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)

1 0

[tor-browser-build/master] Bug 40028: Do not reference unset env variables
by sysrqb＠torproject.org 25 Jul '20

25 Jul '20

commit 2a9d74cba72862ce3da57852958b3173927fb371 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jul 22 16:31:54 2020 +0000 Bug 40028: Do not reference unset env variables --- projects/tor-browser/build | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 155a7bc..24c8265 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -121,14 +121,7 @@ tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files mkdir -p "$TBDIR/$DOCSPATH" cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" -[% IF c("var/namecoin") %] - EXCLUDE_ELECTRUM="" - EXCLUDE_NCPROP279="" -[% ELSE %] - EXCLUDE_ELECTRUM="--exclude=*Electrum-NMC*" - EXCLUDE_NCPROP279="--exclude=*ncprop279*" -[% END %] -tar -C Bundle-Data/[% bundledata_osname %] "${EXCLUDE_ELECTRUM}" "${EXCLUDE_NCPROP279}" -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x +tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" [% IF ! c("var/snowflake") %]

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
by gk＠torproject.org 23 Jul '20

23 Jul '20

commit 103fd5a52d73f77543ab89bf0f3a6ec941c4ea62 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jul 14 11:15:07 2020 -0400 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. --- browser/components/aboutlogins/content/aboutLogins.css | 8 +++++++- .../aboutlogins/content/components/fxaccounts-button.css | 5 +++++ .../components/aboutlogins/content/components/menu-button.css | 10 ++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/browser/components/aboutlogins/content/aboutLogins.css b/browser/components/aboutlogins/content/aboutLogins.css index 7ed29bda8297..dca63da2e649 100644 --- a/browser/components/aboutlogins/content/aboutLogins.css +++ b/browser/components/aboutlogins/content/aboutLogins.css @@ -69,6 +69,11 @@ login-item { grid-area: login; } +/* Do not promote Mozilla Sync in Tor Browser. */ +login-intro { + display: none !important; +} + #branding-logo { flex-basis: var(--sidebar-width); flex-shrink: 0; @@ -83,7 +88,8 @@ login-item { } } -:root:not(.official-branding) #branding-logo { +/* Hide "Firefox LockWise" branding in Tor Browser. */ +#branding-logo { visibility: hidden; } diff --git a/browser/components/aboutlogins/content/components/fxaccounts-button.css b/browser/components/aboutlogins/content/components/fxaccounts-button.css index aefda548c84d..a02707980158 100644 --- a/browser/components/aboutlogins/content/components/fxaccounts-button.css +++ b/browser/components/aboutlogins/content/components/fxaccounts-button.css @@ -8,6 +8,11 @@ align-items: center; } +/* Do not promote Mozilla Sync in Tor Browser. */ +.logged-out-view { + display: none !important; +} + .fxaccounts-extra-text { /* Only show at most 3 lines of text to limit the text from overflowing the header. */ diff --git a/browser/components/aboutlogins/content/components/menu-button.css b/browser/components/aboutlogins/content/components/menu-button.css index 3c93d409b2c7..2d7380b2ea37 100644 --- a/browser/components/aboutlogins/content/components/menu-button.css +++ b/browser/components/aboutlogins/content/components/menu-button.css @@ -85,3 +85,13 @@ .menuitem-mobile-android { background-image: url("chrome://browser/skin/logo-android.svg"); } + +/* + * Do not promote LockWise mobile apps in Tor Browser: hide the menu items + * and the separator line that precedes them. + */ +.menuitem-mobile-android, +.menuitem-mobile-ios, +button[data-event-name="AboutLoginsGetHelp"] + hr { + display: none !important; +}

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
by gk＠torproject.org 23 Jul '20

23 Jul '20

commit 70e01f1c216e6e8e250599de4fe181b20501e006 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 23 13:57:26 2020 -0400 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Disable the "Create New Login" button when security.nocertdb is true. --- browser/components/aboutlogins/AboutLoginsParent.jsm | 2 ++ browser/components/aboutlogins/content/aboutLogins.js | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm index 2ecf82b1fba7..31b4f71a63d6 100644 --- a/browser/components/aboutlogins/AboutLoginsParent.jsm +++ b/browser/components/aboutlogins/AboutLoginsParent.jsm @@ -62,6 +62,7 @@ const PASSWORD_SYNC_NOTIFICATION_ID = "enable-password-sync"; const HIDE_MOBILE_FOOTER_PREF = "signon.management.page.hideMobileFooter"; const SHOW_PASSWORD_SYNC_NOTIFICATION_PREF = "signon.management.page.showPasswordSyncNotification"; +const NOCERTDB_PREF = "security.nocertdb"; // about:logins will always use the privileged content process, // even if it is disabled for other consumers such as about:newtab. @@ -419,6 +420,7 @@ class AboutLoginsParent extends JSWindowActorParent { importVisible: Services.policies.isAllowed("profileImport") && AppConstants.platform != "linux", + canCreateLogins: !Services.prefs.getBoolPref(NOCERTDB_PREF, false), }); await AboutLogins._sendAllLoginRelatedObjects( diff --git a/browser/components/aboutlogins/content/aboutLogins.js b/browser/components/aboutlogins/content/aboutLogins.js index da7d9016a2eb..361b2b0d02bf 100644 --- a/browser/components/aboutlogins/content/aboutLogins.js +++ b/browser/components/aboutlogins/content/aboutLogins.js @@ -19,6 +19,9 @@ const gElements = { get loginFooter() { return this.loginItem.shadowRoot.querySelector("login-footer"); }, + get createNewLoginButton() { + return this.loginList.shadowRoot.querySelector(".create-login-button"); + }, }; let numberOfLogins = 0; @@ -100,6 +103,9 @@ window.addEventListener("AboutLoginsChromeToContent", event => { gElements.loginList.setSortDirection(event.detail.value.selectedSort); document.documentElement.classList.add("initialized"); gElements.loginList.classList.add("initialized"); + if (!event.detail.value.canCreateLogins) { + gElements.createNewLoginButton.disabled = true; + } break; } case "ShowLoginItemError": {

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/4' into tor-browser-78.0.1esr-10.0-1
by gk＠torproject.org 23 Jul '20

23 Jul '20

commit 24dceb653768988eaa04c0082572faeb73fae4b9 Merge: 1b532965f56f 70e01f1c216e Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 23 22:18:01 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/4' into tor-browser-78.0.1esr-10.0-1 browser/components/aboutlogins/AboutLoginsParent.jsm | 2 ++ browser/components/aboutlogins/content/aboutLogins.css | 8 +++++++- browser/components/aboutlogins/content/aboutLogins.js | 6 ++++++ .../aboutlogins/content/components/fxaccounts-button.css | 5 +++++ .../components/aboutlogins/content/components/menu-button.css | 10 ++++++++++ 5 files changed, 30 insertions(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 23 Jul '20

23 Jul '20

commit a2463b202cf29917b97b02eaaf38c4c6df9e887b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 22 14:28:58 2020 -0400 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. --- browser/base/content/aboutDialog-appUpdater-legacy.js | 2 +- browser/components/BrowserContentHandler.jsm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/browser/base/content/aboutDialog-appUpdater-legacy.js b/browser/base/content/aboutDialog-appUpdater-legacy.js index 0629e8eaf41a..9f96e2263295 100644 --- a/browser/base/content/aboutDialog-appUpdater-legacy.js +++ b/browser/base/content/aboutDialog-appUpdater-legacy.js @@ -192,7 +192,7 @@ appUpdater.prototype = { if (aChildID == "downloadAndInstall") { let updateVersion = gAppUpdater.update.displayVersion; // Include the build ID if this is an "a#" (nightly or aurora) build - if (/a\d+$/.test(updateVersion)) { + if (!AppConstants.TOR_BROWSER_UPDATE && /a\d+$/.test(updateVersion)) { let buildID = gAppUpdater.update.buildID; let year = buildID.slice(0, 4); let month = buildID.slice(4, 6); diff --git a/browser/components/BrowserContentHandler.jsm b/browser/components/BrowserContentHandler.jsm index 6888369473e4..1cc1015414fc 100644 --- a/browser/components/BrowserContentHandler.jsm +++ b/browser/components/BrowserContentHandler.jsm @@ -734,9 +734,10 @@ nsBrowserContentHandler.prototype = { "startup.homepage_override_url" ); let update = UpdateManager.activeUpdate; + let old_version = old_tbversion ? old_tbversion: old_mstone; if ( update && - Services.vc.compare(update.appVersion, old_mstone) > 0 + Services.vc.compare(update.appVersion, old_version) > 0 ) { overridePage = getPostUpdateOverridePage(update, overridePage); // Send the update ping to signal that the update was successful.

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/12' into tor-browser-78.0.1esr-10.0-1
by gk＠torproject.org 23 Jul '20

23 Jul '20

commit 1b532965f56fc56ab2a0479ad3baa6bbada1f6c0 Merge: 85acef9c943c a2463b202cf2 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 23 22:10:48 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/12' into tor-browser-78.0.1esr-10.0-1 browser/base/content/aboutDialog-appUpdater-legacy.js | 2 +- browser/components/BrowserContentHandler.jsm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)

1 0

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

23 Jul '20

commit 85acef9c943c21f361ada8b11c95f9830d4fadc6 Merge: 13052ed2adcf c6b4574daf4b Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 23 22:09:37 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/14' into tor-browser-78.0.1esr-10.0-1 browser/confvars.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 23 Jul '20

23 Jul '20

commit c6b4574daf4b3b1ccdbb74c4d1970489ebe4a895 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jul 23 10:59:03 2020 +0000 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. Fixes bug 32612. --- browser/confvars.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/browser/confvars.sh b/browser/confvars.sh index b22913ebca02..f994783f9c65 100755 --- a/browser/confvars.sh +++ b/browser/confvars.sh @@ -24,11 +24,8 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384} # of values. # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t " if test "$MOZ_UPDATE_CHANNEL" = "alpha"; then - # alpha is currently using the -release channel id. However we accept - # both -alpha and -release channel ID for the alpha so that we can - # switch it to -alpha at some point. See bug 32498. - ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-alpha,torbrowser-torproject-release - MAR_CHANNEL_ID=torbrowser-torproject-release + ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-alpha + MAR_CHANNEL_ID=torbrowser-torproject-alpha elif test "$MOZ_UPDATE_CHANNEL" = "nightly"; then ACCEPTED_MAR_CHANNEL_IDS=torbrowser-torproject-nightly MAR_CHANNEL_ID=torbrowser-torproject-nightly

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by gk＠torproject.org 23 Jul '20

23 Jul '20

commit 13052ed2adcf0236392afae3eacc502701d7de8d Author: Alex Catarineu <acat(a)torproject.org> Date: Thu Jul 23 19:02:42 2020 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor --- browser/components/torpreferences/content/torPane.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index 18d27ec4a50b..49054b5dac6a 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -196,14 +196,16 @@ const gTorPane = (function() { TorStrings.settings.useBridge ); this._useBridgeCheckbox.addEventListener("command", e => { - gTorPane.onToggleBridge(e.target.checked).onUpdateBridgeSettings(); + const checked = this._useBridgeCheckbox.checked; + gTorPane.onToggleBridge(checked).onUpdateBridgeSettings(); }); this._bridgeSelectionRadiogroup = prefpane.querySelector( selectors.bridges.bridgeSelectionRadiogroup ); this._bridgeSelectionRadiogroup.value = TorBridgeSource.BUILTIN; this._bridgeSelectionRadiogroup.addEventListener("command", e => { - gTorPane.onSelectBridgeOption(e.target.value).onUpdateBridgeSettings(); + const value = this._bridgeSelectionRadiogroup.value; + gTorPane.onSelectBridgeOption(value).onUpdateBridgeSettings(); }); // Builtin bridges @@ -294,7 +296,8 @@ const gTorPane = (function() { TorStrings.settings.useLocalProxy ); this._useProxyCheckbox.addEventListener("command", e => { - gTorPane.onToggleProxy(e.target.checked).onUpdateProxySettings(); + const checked = this._useProxyCheckbox.checked; + gTorPane.onToggleProxy(checked).onUpdateProxySettings(); }); this._proxyTypeLabel = prefpane.querySelector( selectors.advanced.proxyTypeLabel @@ -316,7 +319,8 @@ const gTorPane = (function() { selectors.advanced.proxyTypeList ); this._proxyTypeMenulist.addEventListener("command", e => { - gTorPane.onSelectProxyType(e.target.value).onUpdateProxySettings(); + const value = this._proxyTypeMenulist.value; + gTorPane.onSelectProxyType(value).onUpdateProxySettings(); }); for (let currentProxy of mockProxies) { let menuEntry = document.createXULElement("menuitem"); @@ -398,7 +402,8 @@ const gTorPane = (function() { TorStrings.settings.useFirewall ); this._useFirewallCheckbox.addEventListener("command", e => { - gTorPane.onToggleFirewall(e.target.checked).onUpdateFirewallSettings(); + const checked = this._useFirewallCheckbox.checked; + gTorPane.onToggleFirewall(checked).onUpdateFirewallSettings(); }); this._allowedPortsLabel = prefpane.querySelector( selectors.advanced.firewallAllowedPortsLabel

1 0

[tor-browser-build/master] Temporarily disable android nightly builds
by boklm＠torproject.org 23 Jul '20

23 Jul '20

commit f60b9ea2f7cde052e527e3ff4418ed91c13ffc8a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jul 23 11:24:44 2020 +0200 Temporarily disable android nightly builds --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index 55154d3..c185137 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -5,7 +5,7 @@ nightly_build_cron_minute: 20 nightly_build_keep_builds: 3 testsuite_dir: "/home/{{ nightly_build_user }}/tbb-testsuite" testsuite_git_url: https://git.torproject.org/tor-browser-bundle-testsuite.git -testsuite_git_commit: ea0942f9da2bdbaf3f140f3baaed1bb56ee9af69 +testsuite_git_commit: 778d9e09fe60b6a61f85f6830d046684c2230ae4 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80

1 0

[tor-browser-bundle-testsuite/master] Temporarily disable android nightly builds
by boklm＠torproject.org 23 Jul '20

23 Jul '20

commit 778d9e09fe60b6a61f85f6830d046684c2230ae4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jul 23 11:15:41 2020 +0200 Temporarily disable android nightly builds --- TBBTestSuite/TestSuite/TorBrowserBuild.pm | 48 ------------------------------- 1 file changed, 48 deletions(-) diff --git a/TBBTestSuite/TestSuite/TorBrowserBuild.pm b/TBBTestSuite/TestSuite/TorBrowserBuild.pm index d391bac..4a695cd 100644 --- a/TBBTestSuite/TestSuite/TorBrowserBuild.pm +++ b/TBBTestSuite/TestSuite/TorBrowserBuild.pm @@ -118,54 +118,6 @@ sub set_tests { type => 'make_incrementals', publish_dir => 'nightly-osx-x86_64', }, - { - name => 'nightly-android-armv7', - descr => 'build tor-browser nightly android-armv7', - type => 'rbm_build', - project => 'release', - targets => [ - 'noversiondir', - 'nightly', - 'torbrowser-android-armv7', - ], - publish_dir => 'nightly-android-armv7', - }, - { - name => 'nightly-android-x86', - descr => 'build tor-browser nightly android-x86', - type => 'rbm_build', - project => 'release', - targets => [ - 'noversiondir', - 'nightly', - 'torbrowser-android-x86', - ], - publish_dir => 'nightly-android-x86', - }, - { - name => 'nightly-android-x86_64', - descr => 'build tor-browser nightly android-x86_64', - type => 'rbm_build', - project => 'release', - targets => [ - 'noversiondir', - 'nightly', - 'torbrowser-android-x86_64', - ], - publish_dir => 'nightly-android-x86_64', - }, - { - name => 'nightly-android-aarch64', - descr => 'build tor-browser nightly android-aarch64', - type => 'rbm_build', - project => 'release', - targets => [ - 'noversiondir', - 'nightly', - 'torbrowser-android-aarch64', - ], - publish_dir => 'nightly-android-aarch64', - }, ]; }

1 0

[tor-browser-build/master] Bug 33851: Omit parental controls when building Firefox and GeckoView
by gk＠torproject.org 23 Jul '20

23 Jul '20

commit 0c8e0d3e8de4ad52d10a9d0a7bb789e676f432ab Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 19 14:29:30 2020 -0400 Bug 33851: Omit parental controls when building Firefox and GeckoView --- projects/firefox/mozconfig-android-aarch64 | 1 + projects/firefox/mozconfig-android-armv7 | 1 + projects/firefox/mozconfig-android-x86 | 1 + projects/firefox/mozconfig-android-x86_64 | 1 + projects/firefox/mozconfig-linux-i686 | 1 + projects/firefox/mozconfig-linux-x86_64 | 1 + projects/firefox/mozconfig-osx-x86_64 | 1 + projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + projects/geckoview/mozconfig-android-aarch64 | 1 + projects/geckoview/mozconfig-android-armv7 | 1 + projects/geckoview/mozconfig-android-x86 | 1 + projects/geckoview/mozconfig-android-x86_64 | 1 + 13 files changed, 13 insertions(+) diff --git a/projects/firefox/mozconfig-android-aarch64 b/projects/firefox/mozconfig-android-aarch64 index 9e4173f..fd86f23 100644 --- a/projects/firefox/mozconfig-android-aarch64 +++ b/projects/firefox/mozconfig-android-aarch64 @@ -41,6 +41,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --without-google-play-services ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-android-armv7 b/projects/firefox/mozconfig-android-armv7 index d13f870..9ee3bfe 100644 --- a/projects/firefox/mozconfig-android-armv7 +++ b/projects/firefox/mozconfig-android-armv7 @@ -41,6 +41,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --without-google-play-services ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-android-x86 b/projects/firefox/mozconfig-android-x86 index 019094c..f7e1ffa 100644 --- a/projects/firefox/mozconfig-android-x86 +++ b/projects/firefox/mozconfig-android-x86 @@ -41,6 +41,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --without-google-play-services ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-android-x86_64 b/projects/firefox/mozconfig-android-x86_64 index 999f51f..3c78993 100644 --- a/projects/firefox/mozconfig-android-x86_64 +++ b/projects/firefox/mozconfig-android-x86_64 @@ -41,6 +41,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --without-google-play-services diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686 index 3ea241f..76c3ba3 100755 --- a/projects/firefox/mozconfig-linux-i686 +++ b/projects/firefox/mozconfig-linux-i686 @@ -29,6 +29,7 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64 index e4d2b99..251cdc0 100755 --- a/projects/firefox/mozconfig-linux-x86_64 +++ b/projects/firefox/mozconfig-linux-x86_64 @@ -29,6 +29,7 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64 index 9b0773d..09c53fc 100644 --- a/projects/firefox/mozconfig-osx-x86_64 +++ b/projects/firefox/mozconfig-osx-x86_64 @@ -41,6 +41,7 @@ ac_add_options --enable-verify-mar ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --disable-tests # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index a2364e9..eb4e212 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -35,6 +35,7 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-webrtc # Bug 1393901 +ac_add_options --disable-parental-controls ac_add_options --disable-tests # Disable telemetry diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 188b3c5..655ca12 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -35,6 +35,7 @@ ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection ac_add_options --disable-webrtc # Bug 1393901 +ac_add_options --disable-parental-controls ac_add_options --disable-tests # Disable telemetry diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64 index dc72f3f..d7b29e0 100644 --- a/projects/geckoview/mozconfig-android-aarch64 +++ b/projects/geckoview/mozconfig-android-aarch64 @@ -30,6 +30,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7 index 36140a5..21d2fa0 100644 --- a/projects/geckoview/mozconfig-android-armv7 +++ b/projects/geckoview/mozconfig-android-armv7 @@ -30,6 +30,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86 index fe703ea..1d6fb3c 100644 --- a/projects/geckoview/mozconfig-android-x86 +++ b/projects/geckoview/mozconfig-android-x86 @@ -30,6 +30,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64 index cddfc09..f6111d3 100644 --- a/projects/geckoview/mozconfig-android-x86_64 +++ b/projects/geckoview/mozconfig-android-x86_64 @@ -30,6 +30,7 @@ ac_add_options --disable-debug ac_add_options --disable-rust-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 23 Jul '20

23 Jul '20

commit 127d9c51c425868c97d4463b6f63f48296b718e2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Jun 15 15:25:49 2020 -0400 squash! TB3: Tor Browser's official .mozconfigs. Bug 33851: Omit Parental Controls. --- .mozconfig | 1 + .mozconfig-android | 1 + .mozconfig-asan | 1 + .mozconfig-mac | 1 + .mozconfig-mingw | 1 + 5 files changed, 5 insertions(+) diff --git a/.mozconfig b/.mozconfig index d0307eaa79c0..d71c858844e3 100755 --- a/.mozconfig +++ b/.mozconfig @@ -25,6 +25,7 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection diff --git a/.mozconfig-android b/.mozconfig-android index 008444714dd4..1b5e3f3178b7 100755 --- a/.mozconfig-android +++ b/.mozconfig-android @@ -27,6 +27,7 @@ ac_add_options --disable-rust-debug ac_add_options --disable-updater ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --enable-proxy-bypass-protection diff --git a/.mozconfig-asan b/.mozconfig-asan index 71f8e65d0732..ca05fb12eedb 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -36,6 +36,7 @@ ac_add_options --enable-tests ac_add_options --enable-debug ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection diff --git a/.mozconfig-mac b/.mozconfig-mac index f6a2645e207c..9be7751f8241 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -46,6 +46,7 @@ ac_add_options --enable-verify-mar ac_add_options --disable-crashreporter ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --disable-tests # Let's make sure no preference is enabling either Adobe's or Google's CDM. ac_add_options --disable-eme diff --git a/.mozconfig-mingw b/.mozconfig-mingw index a920527ccf7b..6a9d3749b2ec 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -22,6 +22,7 @@ ac_add_options --disable-eme ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --disable-webrtc +ac_add_options --disable-parental-controls ac_add_options --disable-tests ac_add_options --enable-proxy-bypass-protection

1 0

[tor-browser/tor-browser-78.0.1esr-10.0-1] fixup! Bug 26345: Hide tracking protection UI
by gk＠torproject.org 23 Jul '20

23 Jul '20

commit 017cd94a74a4063961f3bb3d44cf6351401b8d54 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 19 10:27:37 2020 -0400 fixup! Bug 26345: Hide tracking protection UI --- browser/components/about/AboutRedirector.cpp | 4 ---- browser/components/about/components.conf | 1 - browser/components/moz.build | 1 - 3 files changed, 6 deletions(-) diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index 933d519bd959..544e21782729 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -114,10 +114,6 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, - {"protections", "chrome://browser/content/protections.html", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | - nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS}, {"pioneer", "chrome://browser/content/pioneer.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, #ifdef TOR_BROWSER_UPDATE diff --git a/browser/components/about/components.conf b/browser/components/about/components.conf index f31159d30e15..d78de142e2e4 100644 --- a/browser/components/about/components.conf +++ b/browser/components/about/components.conf @@ -20,7 +20,6 @@ pages = [ 'policies', 'preferences', 'privatebrowsing', - 'protections', 'profiling', 'reader', 'restartrequired', diff --git a/browser/components/moz.build b/browser/components/moz.build index ffee5bafaf70..b660be047b14 100644 --- a/browser/components/moz.build +++ b/browser/components/moz.build @@ -49,7 +49,6 @@ DIRS += [ 'preferences', 'privatebrowsing', 'prompts', - 'protections', 'protocolhandler', 'resistfingerprinting', 'search',

1 0