- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 30038: Remove libgtk2.0 build dependency for WebRTC
by boklm＠torproject.org 05 Apr '19

05 Apr '19

commit f266df2fedf0ab596aaed55b3ee835dcfd55f88b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 5 10:06:54 2019 +0000 Bug 30038: Remove libgtk2.0 build dependency for WebRTC --- projects/webrtc/config | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/webrtc/config b/projects/webrtc/config index 2846765..ff2792e 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -38,7 +38,6 @@ targets: - lib64expat1 - libexpat1-dev:i386 - libglib2.0-dev:i386 - - libgtk2.0-dev:i386 - libgtk-3-dev:i386 - libudev-dev:i386 - libx11-dev:i386 @@ -54,7 +53,6 @@ targets: - libasound2-dev - libexpat1-dev - libglib2.0-dev - - libgtk2.0-dev - libgtk-3-dev - libudev-dev - libx11-dev @@ -67,7 +65,6 @@ targets: lib_path: lib/libwebrtc-darwin-amd64-magic.a arch_deps: - libglib2.0-dev - - libgtk2.0-dev - pkg-config - python-biplist

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 29768: Introduce new features to users
by gk＠torproject.org 04 Apr '19

04 Apr '19

commit e4a163b58530f37b7f292fe49ad7b882b2f046d0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 3 16:14:46 2019 -0400 Bug 29768: Introduce new features to users Add an "update" tour for the Tor Browser 8.5 release that contains two panels: Toolbar and Security (with appropriate description text and images). Display an attention-grabbing dot on the onboarding text bubble when the update tour is active. The animation lasts for 14 seconds. --- browser/app/profile/000-tor-browser.js | 3 +- browser/extensions/onboarding/bootstrap.js | 2 + .../content/img/figure_tor-security-level.png | Bin 0 -> 12185 bytes .../content/img/figure_tor-toolbar-layout.png | Bin 0 -> 5837 bytes .../extensions/onboarding/content/onboarding.css | 54 +++++++++++++-- .../extensions/onboarding/content/onboarding.js | 75 ++++++++++++++++++++- 6 files changed, 128 insertions(+), 6 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index cca469725d28..c810c18a84a1 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -327,8 +327,9 @@ pref("browser.download.panel.shown", true); pref("dom.securecontext.whitelist_onions", true); // Onboarding. +pref("browser.onboarding.tourset-version", 3); pref("browser.onboarding.newtour", "welcome,privacy,tor-network,circuit-display,security,expect-differences,onion-services"); -pref("browser.onboarding.updatetour", "welcome,privacy,tor-network,circuit-display,security,expect-differences,onion-services"); +pref("browser.onboarding.updatetour", "toolbar-update-8.5,security-update-8.5"); pref("browser.onboarding.skip-tour-button.hide", true); // prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) diff --git a/browser/extensions/onboarding/bootstrap.js b/browser/extensions/onboarding/bootstrap.js index a90bef0faaa2..6eec2122ce2a 100644 --- a/browser/extensions/onboarding/bootstrap.js +++ b/browser/extensions/onboarding/bootstrap.js @@ -38,6 +38,8 @@ const PREF_WHITELIST = [ "onboarding-tour-tor-security", "onboarding-tour-tor-expect-differences", "onboarding-tour-tor-onion-services", + "onboarding-tour-tor-toolbar-update-8-5", + "onboarding-tour-tor-security-update-8-5", #if 0 // Firefox tours. To reduce conflicts when rebasing against newer Firefox // code, we use the preprocessor to omit this code block. diff --git a/browser/extensions/onboarding/content/img/figure_tor-security-level.png b/browser/extensions/onboarding/content/img/figure_tor-security-level.png new file mode 100644 index 000000000000..5c7b8c5635fe Binary files /dev/null and b/browser/extensions/onboarding/content/img/figure_tor-security-level.png differ diff --git a/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png b/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png new file mode 100644 index 000000000000..0a8161087827 Binary files /dev/null and b/browser/extensions/onboarding/content/img/figure_tor-toolbar-layout.png differ diff --git a/browser/extensions/onboarding/content/onboarding.css b/browser/extensions/onboarding/content/onboarding.css index e70cf3fa671a..4804c4fbadc6 100644 --- a/browser/extensions/onboarding/content/onboarding.css +++ b/browser/extensions/onboarding/content/onboarding.css @@ -23,11 +23,44 @@ display: block; } -#onboarding-overlay-button { - padding: 10px 0 0 0; +#onboarding-overlay-button-container { + padding: 16px 0 0 0; position: fixed; - cursor: pointer; top: 4px; +} + +/* + * Define an animated attention-grabbing dot which is shown on the + * speech bubble when we are displaying the "updated" tour. +*/ +#onboarding-overlay-button-container.onboarding-overlay-attention-dot::after { + display: inline-block; + position: relative; + content: " "; + width: 20px; + height: 20px; + top: -8px; + offset-inline-start: -16px; + background-color: #00E2B1; + border-radius: 50%; + animation: pulsate 2.0s ease-out; + animation-iteration-count: 7; +} + +@keyframes pulsate { + 0% { + opacity: 1.0; + } + 50% { + opacity: 0.5; + } + 100% { + opacity: 1.0; + } +} + +#onboarding-overlay-button { + cursor: pointer; offset-inline-start: 12px; border: none; /* Set to none so no grey contrast background in the high-contrast mode */ @@ -78,7 +111,7 @@ font-weight: 400; content: attr(aria-label); border: 1px solid transparent; - border-radius: 58px; + border-radius: 12px; padding: 10px 16px; width: auto; height: auto; @@ -308,6 +341,19 @@ grid-template-columns: [tour-page-start] 368px [tour-content-start] 1fr [tour-page-end]; } +.onboarding-tour-description-prefix { + display: inline-block; + margin-bottom: -8px; /* reduce vertical space below */ + padding: 2px 10px; + vertical-align: center; + background-color: #F1F1F3; + border-radius: 4px; + min-height: 25px; + font-size: 10px; + font-weight: 600; + text-transform: uppercase; +} + .onboarding-tour-description { grid-row: tour-page-start / tour-page-end; grid-column: tour-page-start / tour-content-start; diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index ac5569d4b57b..acfcd93c5cef 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -51,6 +51,17 @@ function createOnboardingTourDescription(div, title, description) { } /** + * Helper function to insert a prefix above the tour description. + */ +function addOnboardingTourPrefix(section, l10nId) { + let doc = section.ownerDocument; + let div = doc.createElement("div"); + div.className = "onboarding-tour-description-prefix"; + div.setAttribute("data-l10n-id", l10nId); + section.insertBefore(div, section.firstChild); // Insert as first child. +} + +/** * Helper function to create the tour content UI element. */ function createOnboardingTourContent(div, imageSrc) { @@ -108,6 +119,7 @@ function createOnboardingTourButton(div, buttonId, l10nId, buttonElementTagName **/ // Tor Browser tours: var onboardingTourset = { + // Tour items for new users: "welcome": { id: "onboarding-tour-tor-welcome", tourNameId: TORBROWSER_WELCOME_TOUR_NAME_KEY, @@ -228,6 +240,47 @@ var onboardingTourset = { return div; }, }, + // Tour items for users who have updated their Tor Browser: + "toolbar-update-8.5": { + id: "onboarding-tour-tor-toolbar-update-8-5", + tourNameId: "onboarding.tour-tor-toolbar", + instantComplete: true, + getPage(win) { + let div = win.document.createElement("div"); + + let desc = createOnboardingTourDescription(div, + "onboarding.tour-tor-toolbar-update-8.5.title", "onboarding.tour-tor-toolbar-update-8.5.description"); + addOnboardingTourPrefix(desc, "onboarding.tour-tor-update.prefix-updated"); + + createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-toolbar-layout.png"); + createOnboardingTourButton(div, + "onboarding-tour-tor-toolbar-next-button", "onboarding.tour-tor-toolbar-update-8.5.next-button"); + + return div; + }, + }, + "security-update-8.5": { + id: "onboarding-tour-tor-security-update-8-5", + tourNameId: "onboarding.tour-tor-security", + getPage(win) { + let div = win.document.createElement("div"); + + let desc = createOnboardingTourDescription(div, + "onboarding.tour-tor-security-update-8.5.title", "onboarding.tour-tor-security-update-8.5.description"); + addOnboardingTourPrefix(desc, "onboarding.tour-tor-update.prefix-new"); + + createOnboardingTourContent(div, "resource://onboarding/img/figure_tor-security-level.png"); + let btnContainer = createOnboardingTourButton(div, + "onboarding-tour-tor-security-button", "onboarding.tour-tor-security-level.button"); + btnContainer.className = "onboarding-tour-tor-action-button-container"; + // It is confusing to use the two onion-services IDs below, but they + // provide the functionality and translated string ("Done") that we need. + createOnboardingTourButton(div, + "onboarding-tour-tor-onion-services-next-button", "onboarding.tour-tor-onion-services.next-button"); + + return div; + }, + }, }; #if 0 // Firefox tours. To reduce conflicts when rebasing against newer Firefox @@ -669,6 +722,7 @@ class Onboarding { } else { this._overlayIcon.classList.remove("onboarding-speech-bubble"); } + this.updateAttentionDot(); } _initUI() { @@ -683,7 +737,10 @@ class Onboarding { this._overlayIcon = this._renderOverlayButton(); this._overlayIcon.addEventListener("click", this); this._overlayIcon.addEventListener("keypress", this); - body.insertBefore(this._overlayIcon, body.firstChild); + let buttonContainer = this._window.document.createElement("div"); + buttonContainer.id = "onboarding-overlay-button-container"; + buttonContainer.appendChild(this._overlayIcon); + body.insertBefore(buttonContainer, body.firstChild); this._overlay = this._renderOverlay(); this._overlay.addEventListener("click", this); @@ -917,6 +974,7 @@ class Onboarding { case "onboarding-tour-tor-security-next-button": case "onboarding-tour-tor-expect-differences-next-button": case "onboarding-tour-tor-onion-services-next-button": + case "onboarding-tour-tor-toolbar-next-button": this.gotoNextTourItem(); handledTourActionClick = true; break; @@ -1131,7 +1189,9 @@ class Onboarding { this._overlayIcon.dispatchEvent(new this._window.CustomEvent("Agent:Destroy")); this._clearPrefObserver(); + let buttonContainer = this._overlayIcon.parentElement; this._overlayIcon.remove(); + buttonContainer.remove(); if (this._overlay) { // send overlay-session telemetry this.hideOverlay(); @@ -1155,9 +1215,21 @@ class Onboarding { this._overlayIcon.classList.add("onboarding-watermark"); break; } + this.updateAttentionDot(); return true; } + // Display an attention-grabbing dot on the speech bubble if the + // bubble is visible and we are showing the "update" tour. + updateAttentionDot() { + let buttonContainer = this._overlayIcon.parentElement; + if ((this._bubbleState === "bubble") && (this._tourType === "update")) { + buttonContainer.classList.add("onboarding-overlay-attention-dot"); + } else { + buttonContainer.classList.remove("onboarding-overlay-attention-dot"); + } + } + showOverlay() { if (this._tourItems.length == 0) { // Lazy loading until first toggle. @@ -1418,6 +1490,7 @@ class Onboarding { // After the notification mute on the 1st session, // we don't want to show the speech bubble by default this._overlayIcon.classList.remove("onboarding-speech-bubble"); + this.updateAttentionDot(); let queue = this._getNotificationQueue(); let totalMaxTime = Services.prefs.getIntPref("browser.onboarding.notification.max-life-time-all-tours-ms");

1 0

[torbutton/master] Bugs 22538 and 22513: Fix new circuit button for neterror and certerror
by gk＠torproject.org 04 Apr '19

04 Apr '19

commit 7287a25268adb13789de3c5649780f9f4813d0d1 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Apr 3 18:09:30 2019 +0200 Bugs 22538 and 22513: Fix new circuit button for neterror and certerror --- src/chrome/content/torbutton.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index f1b1dc0c..2421548d 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -18,6 +18,7 @@ const k_tb_last_browser_version_pref = "extensions.torbutton.lastBrowserVersion" const k_tb_browser_update_needed_pref = "extensions.torbutton.updateNeeded"; const k_tb_last_update_check_pref = "extensions.torbutton.lastUpdateCheck"; const k_tb_tor_check_failed_topic = "Torbutton:TorCheckFailed"; +const k_tb_about_uri_first_party_domain = "about.ef2a7dd5-93bc-417f-a698-142c3116864f.mozilla"; var m_tb_prefs = Services.prefs; @@ -861,6 +862,22 @@ function torbutton_send_ctrl_cmd(command) { function torbutton_new_circuit() { let firstPartyDomain = gBrowser.contentPrincipal.originAttributes .firstPartyDomain; + // Bug 22538: For neterror or certerror, get firstPartyDomain causing it from the u param + if (firstPartyDomain === k_tb_about_uri_first_party_domain) { + let knownErrors = ["about:neterror", "about:certerror"]; + let origin = gBrowser.contentPrincipal.origin || ''; + if (knownErrors.some(x => origin.startsWith(x))) { + try { + let urlOrigin = new URL(origin); + let { hostname } = new URL(urlOrigin.searchParams.get('u')); + if (hostname) { + firstPartyDomain = Services.eTLD.getBaseDomainFromHost(hostname) || firstPartyDomain; + } + } catch (e) { + torbutton_log(4, "Exception on new circuit" +e); + } + } + } let domainIsolator = Cc["@torproject.org/domain-isolator;1"] .getService(Ci.nsISupports).wrappedJSObject;

1 0

[torbutton/master] Merge remote-tracking branch 'acat/22538+1'
by gk＠torproject.org 04 Apr '19

04 Apr '19

commit 5e3bc46165b0963bb63976f17c742da5dd5fd724 Merge: 9d7c1081 7287a252 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 4 11:58:45 2019 +0000 Merge remote-tracking branch 'acat/22538+1' src/chrome/content/torbutton.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)

1 0

[torbutton/master] Bug 29768: Introduce new features to users
by gk＠torproject.org 04 Apr '19

04 Apr '19

commit 9d7c1081105eb3858f6654daa31202d4bac1d84f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Apr 3 16:04:30 2019 -0400 Bug 29768: Introduce new features to users Add strings for the "update" onboarding tour. --- src/chrome/locale/en-US/browserOnboarding.properties | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/chrome/locale/en-US/browserOnboarding.properties b/src/chrome/locale/en-US/browserOnboarding.properties index b97d77a0..e2036832 100644 --- a/src/chrome/locale/en-US/browserOnboarding.properties +++ b/src/chrome/locale/en-US/browserOnboarding.properties @@ -41,6 +41,18 @@ onboarding.tour-tor-onion-services.description=Onion services are sites that end onboarding.tour-tor-onion-services.button=Visit an Onion onboarding.tour-tor-onion-services.next-button=Done +onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S +onboarding.tour-tor-update.prefix-new=New +onboarding.tour-tor-update.prefix-updated=Updated + +onboarding.tour-tor-toolbar=Toolbar +onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout +onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser toolbar layout. We moved the Torbutton icon after the URL bar, and we added a security level icon next to it. +onboarding.tour-tor-toolbar-update-8.5.next-button=Go to Security + +onboarding.tour-tor-security-update-8.5.title=Security level experience +onboarding.tour-tor-security-update-8.5.description=We improved how you see and set your security level. We replaced the security slider with a toolbar icon that makes your current level visible at all times. Click it to view details about your current level or to change your security settings. + # Circuit Display onboarding. onboarding.tor-circuit-display.next=Next onboarding.tor-circuit-display.done=Done

1 0

[tor-browser-build/master] Merge remote-tracking branch 'JeremyRand/wheezy-archive'
by boklm＠torproject.org 04 Apr '19

04 Apr '19

commit d8f156e110afe00e0b366cff8ff0e0c53b4a58c9 Merge: 9dda80f 9907a1f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 4 11:52:27 2019 +0200 Merge remote-tracking branch 'JeremyRand/wheezy-archive' projects/debootstrap-image/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 29966: Use archive.debian.org for Wheezy images
by boklm＠torproject.org 04 Apr '19

04 Apr '19

commit 9907a1f470cf226285f09ba2911a9a45abbee663 Author: JeremyRand <biolizard89(a)gmail.com> Date: Sat Mar 30 23:33:53 2019 +0000 Bug 29966: Use archive.debian.org for Wheezy images Wheezy is removed from deb.debian.org, so container image builds were failing. --- projects/debootstrap-image/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/debootstrap-image/config b/projects/debootstrap-image/config index 9499eb8..7d535ec 100644 --- a/projects/debootstrap-image/config +++ b/projects/debootstrap-image/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: 'container-image_[% c("var/container/suite") %]-[% c("var/container/arch") %]-[% c("version") %].tar.gz' -version: 1 +version: 2 pkg_type: build var: @@ -56,6 +56,7 @@ targets: container: suite: wheezy arch: amd64 + debootstrap_mirror: "http://archive.debian.org/debian/" jessie-amd64: var:

1 0

[tor-browser-build/master] Bug 29980: Add android-x86 target to README files
by boklm＠torproject.org 02 Apr '19

02 Apr '19

commit 9dda80f41584d93b9e30fc534c6de46337fecb30 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 2 07:18:23 2019 +0000 Bug 29980: Add android-x86 target to README files --- README | 1 + README.HACKING | 18 ++++++++++-------- README.MAKEFILE | 12 ++++++++---- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/README b/README index e1e93c6..2b09ab1 100644 --- a/README +++ b/README @@ -81,6 +81,7 @@ name to the makefile target: $ make nightly-windows-i686 $ make nightly-osx-x86_64 $ make nightly-android-armv7 + $ make nightly-android-x86 When you want to quickly do a build to test a change, you can use the testbuild makefile target, and find the build in the testbuild directory. diff --git a/README.HACKING b/README.HACKING index 7634093..081a3d5 100644 --- a/README.HACKING +++ b/README.HACKING @@ -45,17 +45,17 @@ The targets are usually used to select: - the platform: torbrowser-linux-x86_64, torbrowser-linux-i686, torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, - torbrowser-android-armv7 + torbrowser-android-armv7, torbrowser-android-x86 - the channel: release, nightly, alpha The targets torbrowser-linux-x86_64, torbrowser-linux-i686, -torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, and -torbrowser-android-armv7 are special cases. They do not contain options -directly, instead they contain a list of other targets. For instance, the -torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and linux -targets. You should define an option under the linux target if it applies to -Linux on both architectures, or under the linux-x86_64 if it only applies to the -x86_64 architecture. +torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, +torbrowser-android-armv7, and torbrowser-android-x86 are special cases. They do +not contain options directly, instead they contain a list of other targets. For +instance, the torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and +linux targets. You should define an option under the linux target if it applies +to Linux on both architectures, or under the linux-x86_64 if it only applies to +the x86_64 architecture. An option that is defined at the root of rbm.conf can be overridden by an other definition under a target, or inside projects/$project/config. @@ -156,6 +156,8 @@ $platform should be one of the following: - torbrowser-android-armv7 + - torbrowser-android-x86 + For example, to see tor's build script for linux x86_64 on the alpha channel, you can use: diff --git a/README.MAKEFILE b/README.MAKEFILE index 7351c5f..addff64 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -7,7 +7,8 @@ release Build Tor Browser for the release channel, for all supported platforms. The resulting build can be found in directory release/$version. -release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} ----------------------------------------------------------------------- Same as release, for the selected platform only. @@ -16,7 +17,8 @@ alpha Build Tor Browser for the alpha channel, for all supported platforms. The resulting build can be found in directory alpha/$version. -alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} --------------------------------------------------------------------- Same as alpha, for the selected platform only. @@ -29,7 +31,8 @@ components. The resulting build can be found in directory nightly/$date -nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} ----------------------------------------------------------------------- Same as nightly, for the selected platform only. @@ -39,7 +42,8 @@ Build Tor Browser for the alpha channel, for all supported platforms. This is the same as 'make alpha', but the output directory is different. The resulting build can be found in directory alpha_nightly/$date -alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, + android-x86} ----------------------------------------------------------------------------- The same as alpha_nightly, for the selected platform only.

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit 6e730d5184f8d74860488f8fa998bd1e0023281f Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 1 13:56:22 2019 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Bug 29916: Make sure enterprise policies are disabled --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 08d00866ef04..cca469725d28 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -225,6 +225,9 @@ pref("network.file.disable_unc_paths", true); // Enhance our treatment of file:// to avoid proxy bypasses (see Mozilla's bug // 1412081) pref("network.file.path_blacklist", "/net"); +// Make sure no enterprise policy can interfere with our proxy settings, see +// #29916. +pref("browser.policies.testing.disallowEnterprise", true); // Security slider pref("svg.in-content.enabled", true);

1 0

[tor-browser/tor-browser-60.6.1esr-8.5-1] Revert "Bug 29445: Enable support for enterprise policies"
by gk＠torproject.org 01 Apr '19

01 Apr '19

commit e95c515352094f6c3d943a3313628c370feb18f2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Apr 1 13:51:43 2019 +0000 Revert "Bug 29445: Enable support for enterprise policies" This reverts commit 00a7fc743aebc68f59df743236c2165274cbc608. --- browser/components/enterprisepolicies/EnterprisePolicies.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js index 1380c0c228a4..7c864f5fbc43 100644 --- a/browser/components/enterprisepolicies/EnterprisePolicies.js +++ b/browser/components/enterprisepolicies/EnterprisePolicies.js @@ -126,7 +126,7 @@ EnterprisePoliciesManager.prototype = { } if (policySchema.enterprise_only && !areEnterpriseOnlyPoliciesAllowed()) { - log.error(`Enterprise policy ${policyName} is not allowed`); + log.error(`Policy ${policyName} is only allowed on ESR`); continue; } @@ -314,6 +314,10 @@ let DisallowedFeatures = {}; * Checks whether the policies marked as enterprise_only in the * schema are allowed to run on this browser. * + * This is meant to only allow policies to run on ESR, but in practice + * we allow it to run on channels different than release, to allow + * these policies to be tested on pre-release channels. + * * @returns {Bool} Whether the policy can run. */ function areEnterpriseOnlyPoliciesAllowed() { @@ -324,7 +328,12 @@ function areEnterpriseOnlyPoliciesAllowed() { return false; } - return true; + if (AppConstants.MOZ_UPDATE_CHANNEL != "release" || + Cu.isInAutomation) { + return true; + } + + return false; } /*

1 0