- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 30380 - Add patch for canceling Dormant by startup
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit e30f06ac6c40a32354fe01a2613fb3c2a63e630c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 26 00:52:18 2019 +0000 Bug 30380 - Add patch for canceling Dormant by startup --- projects/tor-onion-proxy-library/build | 1 + .../tor-onion-proxy-library/canceldormant.patch | 46 ++++++++++++++++++++++ projects/tor-onion-proxy-library/config | 1 + 3 files changed, 48 insertions(+) diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 605f017..41cc815 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -18,6 +18,7 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz # Patch projects cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/gradle.patch +patch -p1 < $rootdir/canceldormant.patch # Build Android Libraries and Apps $GRADLE_HOME/gradle-4.10.2/bin/gradle --offline --no-daemon -P androidplugin=3.1.0 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint diff --git a/projects/tor-onion-proxy-library/canceldormant.patch b/projects/tor-onion-proxy-library/canceldormant.patch new file mode 100644 index 0000000..8d48af1 --- /dev/null +++ b/projects/tor-onion-proxy-library/canceldormant.patch @@ -0,0 +1,46 @@ +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java +index 5f5adac..da6747f 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java +@@ -187,4 +187,9 @@ public class DefaultSettings implements TorSettings { + public boolean useSocks5() { + return false; + } ++ ++ @Override ++ public boolean hasDormantCanceledByStartup() { ++ return false; ++ } + } +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index e324d9f..99e5693 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -503,6 +503,16 @@ public final class TorConfigBuilder { + return virtualAddressNetwork(settings.getVirtualAddressNetwork()); + } + ++ public TorConfigBuilder dormantCanceledByStartup() { ++ buffer.append("DormantCanceledByStartup 1").append('\n'); ++ return this; ++ } ++ ++ @SettingsConfig ++ public TorConfigBuilder domantCanceledByStartupFromSettings() { ++ return settings.hasDormantCanceledByStartup() ? dormantCanceledByStartup() : this; ++ } ++ + /** + * Adds bridges from a resource stream. This relies on the TorInstaller to know how to obtain this stream. + * These entries may be type-specified like: +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java +index 2d515d1..43f01ef 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java +@@ -77,4 +77,6 @@ public interface TorSettings { + String transPort(); + + boolean useSocks5(); ++ ++ boolean hasDormantCanceledByStartup(); + } diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 02b69ac..c2bd1a4 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -29,3 +29,4 @@ input_files: name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch + - filename: canceldormant.patch

1 0

[tor-android-service/master] Update tor libraries to 0.4.1.5 (from tor-android: commit-95432556b84df208fd36175fda0c495ffc421ecf)
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit dc4ae061fab5d0f35e93b296a3f618baf6af8f36 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Sep 22 12:12:12 2019 -0700 Update tor libraries to 0.4.1.5 (from tor-android: commit-95432556b84df208fd36175fda0c495ffc421ecf) --- service/src/main/jniLibs/arm64-v8a/libTor.so | Bin 7774616 -> 8610184 bytes service/src/main/jniLibs/armeabi-v7a/libTor.so | Bin 7774616 -> 8129728 bytes service/src/main/jniLibs/armeabi/libTor.so | Bin 7774616 -> 0 bytes service/src/main/jniLibs/x86/libTor.so | Bin 7791604 -> 9020648 bytes service/src/main/jniLibs/x86_64/libTor.so | Bin 7791604 -> 8254824 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/service/src/main/jniLibs/arm64-v8a/libTor.so b/service/src/main/jniLibs/arm64-v8a/libTor.so index 9ff0e9d..5fc7361 100755 Binary files a/service/src/main/jniLibs/arm64-v8a/libTor.so and b/service/src/main/jniLibs/arm64-v8a/libTor.so differ diff --git a/service/src/main/jniLibs/armeabi-v7a/libTor.so b/service/src/main/jniLibs/armeabi-v7a/libTor.so index 9ff0e9d..b001906 100755 Binary files a/service/src/main/jniLibs/armeabi-v7a/libTor.so and b/service/src/main/jniLibs/armeabi-v7a/libTor.so differ diff --git a/service/src/main/jniLibs/armeabi/libTor.so b/service/src/main/jniLibs/armeabi/libTor.so deleted file mode 100755 index 9ff0e9d..0000000 Binary files a/service/src/main/jniLibs/armeabi/libTor.so and /dev/null differ diff --git a/service/src/main/jniLibs/x86/libTor.so b/service/src/main/jniLibs/x86/libTor.so index 6f93a98..dabda5c 100755 Binary files a/service/src/main/jniLibs/x86/libTor.so and b/service/src/main/jniLibs/x86/libTor.so differ diff --git a/service/src/main/jniLibs/x86_64/libTor.so b/service/src/main/jniLibs/x86_64/libTor.so index 6f93a98..55be241 100755 Binary files a/service/src/main/jniLibs/x86_64/libTor.so and b/service/src/main/jniLibs/x86_64/libTor.so differ

1 0

[tor-android-service/master] Merge remote-tracking branch 'sysrqb/bug31192_00'
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 50d01b1fbc6e776d0b39f42f644137dd25a92c7a Merge: 8d307a6 ccaf68c Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 26 14:58:05 2019 +0000 Merge remote-tracking branch 'sysrqb/bug31192_00' .../android/service/AndroidTorSettings.java | 5 +++++ .../org/torproject/android/service/TorService.java | 4 ++-- service/src/main/jniLibs/arm64-v8a/libTor.so | Bin 7774616 -> 8610184 bytes service/src/main/jniLibs/armeabi-v7a/libTor.so | Bin 7774616 -> 8129728 bytes service/src/main/jniLibs/armeabi/libTor.so | Bin 7774616 -> 0 bytes service/src/main/jniLibs/x86/libTor.so | Bin 7791604 -> 9020648 bytes service/src/main/jniLibs/x86_64/libTor.so | Bin 7791604 -> 8254824 bytes 7 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor-android-service/master] Bug 31192 - Bump Tor version number string
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit ccaf68ccb3ae3de23990f65d0504a2e19bf01897 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Sep 26 14:41:35 2019 +0000 Bug 31192 - Bump Tor version number string --- service/src/main/java/org/torproject/android/service/TorService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/org/torproject/android/service/TorService.java b/service/src/main/java/org/torproject/android/service/TorService.java index dea4bd2..16d2537 100644 --- a/service/src/main/java/org/torproject/android/service/TorService.java +++ b/service/src/main/java/org/torproject/android/service/TorService.java @@ -31,7 +31,7 @@ import java.util.concurrent.Executors; public final class TorService extends Service implements TorServiceConstants, OrbotConstants { - public final static String TOR_VERSION = "0.3.5.8-rc-openssl1.0.2p"; + public final static String TOR_VERSION = "0.4.1.5-rc-openssl1.0.2p"; private static final int NOTIFY_ID = 1; private static final int ERROR_NOTIFY_ID = 3; private final static String NOTIFICATION_CHANNEL_ID = "orbot_channel_1"; @@ -454,4 +454,4 @@ public final class TorService extends Service implements TorServiceConstants, Or builder.torExecutable(exe); return builder.build(); } -} \ No newline at end of file +}

1 0

[tor-android-service/master] Bug 30380 - Support DormantCanceledByStartup
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 5bc203890cd66a10110f94b3dcd921fc5a6c90b9 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Sep 26 00:54:12 2019 +0000 Bug 30380 - Support DormantCanceledByStartup --- .../main/java/org/torproject/android/service/AndroidTorSettings.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/service/src/main/java/org/torproject/android/service/AndroidTorSettings.java b/service/src/main/java/org/torproject/android/service/AndroidTorSettings.java index a875857..4759376 100644 --- a/service/src/main/java/org/torproject/android/service/AndroidTorSettings.java +++ b/service/src/main/java/org/torproject/android/service/AndroidTorSettings.java @@ -218,4 +218,9 @@ public class AndroidTorSettings implements TorSettings { public boolean useSocks5() { return Prefs.useVpn() && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP; } + + @Override + public boolean hasDormantCanceledByStartup() { + return true; + } }

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1573276 - Always allow localization in error pages r=johannh, peterv
by gk＠torproject.org 26 Sep '19

26 Sep '19

commit 9c1877056070c4de048b18e201fcb3dfcb1e1a02 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Sep 25 10:39:45 2019 +0000 Bug 1573276 - Always allow localization in error pages r=johannh,peterv Differential Revision: https://phabricator.services.mozilla.com/D43216 --HG-- extra : moz-landing-system : lando --- .../content/test/about/browser_aboutCertError.js | 23 ++++++++++++++++++++ browser/base/content/test/about/head.js | 13 ++++++----- dom/base/Document.cpp | 8 ++++--- dom/base/nsContentUtils.cpp | 25 +++++++++++++++++++++- dom/base/nsContentUtils.h | 9 ++++---- dom/security/nsContentSecurityManager.cpp | 6 +++++- parser/htmlparser/nsExpatDriver.cpp | 22 +++++++++++-------- 7 files changed, 83 insertions(+), 23 deletions(-) diff --git a/browser/base/content/test/about/browser_aboutCertError.js b/browser/base/content/test/about/browser_aboutCertError.js index 1544bab15f99..3e9a13dd99f3 100644 --- a/browser/base/content/test/about/browser_aboutCertError.js +++ b/browser/base/content/test/about/browser_aboutCertError.js @@ -459,3 +459,26 @@ add_task(async function checkBadStsCertHeadline() { BrowserTestUtils.removeTab(gBrowser.selectedTab); } }); + +add_task(async function checkSandboxedIframe() { + info( + "Loading a bad sts cert error in a sandboxed iframe and check that the correct headline is shown" + ); + let useFrame = true; + let sandboxed = true; + let tab = await openErrorPage(BAD_CERT, useFrame, sandboxed); + let browser = tab.linkedBrowser; + + let titleContent = await ContentTask.spawn(browser, {}, async function() { + // Cannot test for error in the Advanced section since it's currently not present + // in a sandboxed iframe. + let doc = content.document.querySelector("iframe").contentDocument; + let titleText = doc.querySelector(".title-text"); + return titleText.textContent; + }); + ok( + titleContent.endsWith("Security Issue"), + "Did Not Connect: Potential Security Issue" + ); + BrowserTestUtils.removeTab(gBrowser.selectedTab); +}); diff --git a/browser/base/content/test/about/head.js b/browser/base/content/test/about/head.js index 82fa5dcd540d..74f961dcefae 100644 --- a/browser/base/content/test/about/head.js +++ b/browser/base/content/test/about/head.js @@ -44,17 +44,20 @@ function getPEMString(cert) { ); } -function injectErrorPageFrame(tab, src) { +function injectErrorPageFrame(tab, src, sandboxed) { return ContentTask.spawn( tab.linkedBrowser, - { frameSrc: src }, - async function({ frameSrc }) { + { frameSrc: src, frameSandboxed: sandboxed }, + async function({ frameSrc, frameSandboxed }) { let loaded = ContentTaskUtils.waitForEvent( content.wrappedJSObject, "DOMFrameContentLoaded" ); let iframe = content.document.createElement("iframe"); iframe.src = frameSrc; + if (frameSandboxed) { + iframe.setAttribute("sandbox", "allow-scripts"); + } content.document.body.appendChild(iframe); await loaded; // We will have race conditions when accessing the frame content after setting a src, @@ -67,7 +70,7 @@ function injectErrorPageFrame(tab, src) { ); } -async function openErrorPage(src, useFrame) { +async function openErrorPage(src, useFrame, sandboxed) { let dummyPage = getRootDirectory(gTestPath).replace( "chrome://mochitests/content", @@ -78,7 +81,7 @@ async function openErrorPage(src, useFrame) { if (useFrame) { info("Loading cert error page in an iframe"); tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, dummyPage); - await injectErrorPageFrame(tab, src); + await injectErrorPageFrame(tab, src, sandboxed); } else { let certErrorLoaded; tab = await BrowserTestUtils.openNewForegroundTab( diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp index eebeada1c63c..cdeabc4dc7b9 100644 --- a/dom/base/Document.cpp +++ b/dom/base/Document.cpp @@ -3225,11 +3225,13 @@ DocumentL10n* Document::GetL10n() { return mDocumentL10n; } bool Document::DocumentSupportsL10n(JSContext* aCx, JSObject* aObject) { nsCOMPtr<nsIPrincipal> callerPrincipal = nsContentUtils::SubjectPrincipal(aCx); - return nsContentUtils::PrincipalAllowsL10n(callerPrincipal); + nsGlobalWindowInner* win = xpc::WindowOrNull(aObject); + return nsContentUtils::PrincipalAllowsL10n( + callerPrincipal, win ? win->GetDocumentURI() : nullptr); } void Document::LocalizationLinkAdded(Element* aLinkElement) { - if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal())) { + if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal(), GetDocumentURI())) { return; } @@ -3260,7 +3262,7 @@ void Document::LocalizationLinkAdded(Element* aLinkElement) { } void Document::LocalizationLinkRemoved(Element* aLinkElement) { - if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal())) { + if (!nsContentUtils::PrincipalAllowsL10n(NodePrincipal(), GetDocumentURI())) { return; } diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 66134cdb691f..cfae3ef224b3 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -250,6 +250,7 @@ #include "nsThreadManager.h" #include "nsIBidiKeyboard.h" #include "ReferrerInfo.h" +#include "nsAboutProtocolUtils.h" #if defined(XP_WIN) // Undefine LoadImage to prevent naming conflict with Windows. @@ -1676,8 +1677,30 @@ bool nsContentUtils::OfflineAppAllowed(nsIPrincipal* aPrincipal) { return NS_SUCCEEDED(rv) && allowed; } +static bool IsErrorPage(nsIURI* aURI) { + if (!aURI) { + return false; + } + + if (!aURI->SchemeIs("about")) { + return false; + } + + nsAutoCString name; + nsresult rv = NS_GetAboutModuleName(aURI, name); + NS_ENSURE_SUCCESS(rv, false); + + return name.EqualsLiteral("certerror") || name.EqualsLiteral("neterror") || + name.EqualsLiteral("blocked"); +} + /* static */ -bool nsContentUtils::PrincipalAllowsL10n(nsIPrincipal* aPrincipal) { +bool nsContentUtils::PrincipalAllowsL10n(nsIPrincipal* aPrincipal, + nsIURI* aDocumentURI) { + if (IsErrorPage(aDocumentURI)) { + return true; + } + // The system principal is always allowed. if (IsSystemPrincipal(aPrincipal)) { return true; diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 46818cc43a1b..2bf27250e68b 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1984,11 +1984,12 @@ class nsContentUtils { static bool OfflineAppAllowed(nsIPrincipal* aPrincipal); /** - * Determine whether the principal is allowed access to the localization - * system. We don't want the web to ever see this but all our UI including in - * content pages should pass this test. + * Determine whether the principal or document is allowed access to the + * localization system. We don't want the web to ever see this but all our UI + * including in content pages should pass this test. */ - static bool PrincipalAllowsL10n(nsIPrincipal* aPrincipal); + static bool PrincipalAllowsL10n(nsIPrincipal* aPrincipal, + nsIURI* aDocumentURI); /** * If offline-apps.allow_by_default is true, we set offline-app permission diff --git a/dom/security/nsContentSecurityManager.cpp b/dom/security/nsContentSecurityManager.cpp index e7a0a9d1a72b..10ee46858654 100644 --- a/dom/security/nsContentSecurityManager.cpp +++ b/dom/security/nsContentSecurityManager.cpp @@ -333,7 +333,11 @@ static nsresult DoCheckLoadURIChecks(nsIURI* aURI, nsILoadInfo* aLoadInfo) { // same principal check as Fluent. if (aLoadInfo->InternalContentPolicyType() == nsIContentPolicy::TYPE_INTERNAL_DTD) { - return nsContentUtils::PrincipalAllowsL10n(aLoadInfo->TriggeringPrincipal()) + RefPtr<Document> doc; + aLoadInfo->GetLoadingDocument(getter_AddRefs(doc)); + return nsContentUtils::PrincipalAllowsL10n( + aLoadInfo->TriggeringPrincipal(), + doc ? doc->GetDocumentURI() : nullptr) ? NS_OK : NS_ERROR_DOM_BAD_URI; } diff --git a/parser/htmlparser/nsExpatDriver.cpp b/parser/htmlparser/nsExpatDriver.cpp index 9f2321cd2831..73a0e65328f0 100644 --- a/parser/htmlparser/nsExpatDriver.cpp +++ b/parser/htmlparser/nsExpatDriver.cpp @@ -628,33 +628,37 @@ nsresult nsExpatDriver::OpenInputStreamFromExternalDTD(const char16_t* aFPIStr, nsContentUtils::GetSystemPrincipal(), nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, nsIContentPolicy::TYPE_DTD); + NS_ENSURE_SUCCESS(rv, rv); } else { NS_ASSERTION( mSink == nsCOMPtr<nsIExpatSink>(do_QueryInterface(mOriginalSink)), "In nsExpatDriver::OpenInputStreamFromExternalDTD: " "mOriginalSink not the same object as mSink?"); nsContentPolicyType policyType = nsIContentPolicy::TYPE_INTERNAL_DTD; - nsCOMPtr<nsIPrincipal> loadingPrincipal; if (mOriginalSink) { nsCOMPtr<Document> doc; doc = do_QueryInterface(mOriginalSink->GetTarget()); if (doc) { - loadingPrincipal = doc->NodePrincipal(); if (doc->SkipDTDSecurityChecks()) { policyType = nsIContentPolicy::TYPE_INTERNAL_FORCE_ALLOWED_DTD; } + rv = NS_NewChannel(getter_AddRefs(channel), uri, doc, + nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS | + nsILoadInfo::SEC_ALLOW_CHROME, + policyType); + NS_ENSURE_SUCCESS(rv, rv); } } - if (!loadingPrincipal) { - loadingPrincipal = + if (!channel) { + nsCOMPtr<nsIPrincipal> nullPrincipal = mozilla::NullPrincipal::CreateWithoutOriginAttributes(); + rv = NS_NewChannel(getter_AddRefs(channel), uri, nullPrincipal, + nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS | + nsILoadInfo::SEC_ALLOW_CHROME, + policyType); + NS_ENSURE_SUCCESS(rv, rv); } - rv = NS_NewChannel(getter_AddRefs(channel), uri, loadingPrincipal, - nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_INHERITS | - nsILoadInfo::SEC_ALLOW_CHROME, - policyType); } - NS_ENSURE_SUCCESS(rv, rv); nsAutoCString absURL; rv = uri->GetSpec(absURL);

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 24920 - Only create Private tabs if browser.privatebrowsing.autostart is true
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit a07356ac7693bec4ed1b206bdbeb64287cb2a7f6 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Sep 19 02:13:08 2019 +0000 fixup! Bug 24920 - Only create Private tabs if browser.privatebrowsing.autostart is true --- mobile/android/chrome/content/browser.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index dbecd308a3dc..fc66e8b4f23e 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -4413,9 +4413,14 @@ Tab.prototype = { // Must be called after appendChild so the docShell has been created. this.setActive(false); + // Create a Private tab if it was explicitly requested or if the pref + // |browser.privatebrowsing.autostart| is true. If the pref is true, then all tabs are created + // as private tabs. The first clause covers new tabs requested by a user. The preference check + // is important because extensions directly open tabs (usually not private tabs) and bypass the + // private tab checks. let isPrivate = (("isPrivate" in aParams) && aParams.isPrivate) || Services.prefs.getBoolPref("browser.privatebrowsing.autostart"); if (isPrivate) { - attrs['privateBrowsingId'] = 1; + attrs.privateBrowsingId = 1; } this.browser.docShell.setOriginAttributes(attrs);

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31720: Enable website suggestions in address bar
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit 683863bc344137462c60c6ae001d1333df41297d Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed Sep 18 18:32:24 2019 +0000 Bug 31720: Enable website suggestions in address bar --- mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java index f03548e30ced..5d6f725dc1c5 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java @@ -1452,7 +1452,9 @@ public class BrowserApp extends GeckoApp // Website suggestions for address bar inputs should not be enabled when running in automation. // After the upgrade to support library v.26 it could fail otherwise unrelated Robocop tests // See https://bugzilla.mozilla.org/show_bug.cgi?id=1385464#c3 - if (!isInAutomation) { + // But only disable it when this isn't Tor Browser, because isInAutomation is overloaded such + // that it is |true| in Tor Browser. + if (!isInAutomation || AppConstants.isTorBrowser()) { mBrowserToolbar.setOnFilterListener(new BrowserToolbar.OnFilterListener() { @Override public void onFilter(String searchText, AutocompleteHandler handler) {

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit fa3095e61aacd345601435a0e91ee2b44e1a9b07 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 9 12:56:39 2019 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 31575: Disable newtabpage --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 10c31084adcc..09386d32a12c 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -106,6 +106,7 @@ pref("services.sync.engine.addons", false); pref("services.sync.engine.tabs", false); pref("extensions.getAddons.cache.enabled", false); // https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/ pref("browser.newtabpage.preload", false); // Bug 16316 - Avoid potential confusion over tiles for now. +pref("browser.newtabpage.enabled", false); pref("browser.search.countryCode", "US"); // The next three prefs disable GeoIP search lookups (#16254) pref("browser.search.region", "US"); pref("browser.search.geoip.url", "");

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31575: Replace Firefox Home (newtab) with about:tor
by gk＠torproject.org 25 Sep '19

25 Sep '19

commit e11a1889ae871a9ced871346f5f9eb3e0a9ab6d3 Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Sep 9 13:04:34 2019 +0200 Bug 31575: Replace Firefox Home (newtab) with about:tor Patching AboutNewTabService so that AboutNewTab is not loaded to avoid several network requests that we do not need. Besides, about:newtab will now point to about:blank or about:tor (depending on browser.newtabpage.enabled) and about:home will point to about:tor. --- browser/components/newtab/AboutNewTabService.jsm | 29 +--------------------- browser/components/preferences/in-content/home.xul | 4 +-- .../preferences/in-content/preferences.xul | 5 +++- browser/modules/HomePage.jsm | 2 +- 4 files changed, 8 insertions(+), 32 deletions(-) diff --git a/browser/components/newtab/AboutNewTabService.jsm b/browser/components/newtab/AboutNewTabService.jsm index 8995d82d543b..117b9d6347cd 100644 --- a/browser/components/newtab/AboutNewTabService.jsm +++ b/browser/components/newtab/AboutNewTabService.jsm @@ -10,9 +10,6 @@ const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); const {E10SUtils} = ChromeUtils.import("resource://gre/modules/E10SUtils.jsm"); -ChromeUtils.defineModuleGetter(this, "AboutNewTab", - "resource:///modules/AboutNewTab.jsm"); - const TOPIC_APP_QUIT = "quit-application-granted"; const TOPIC_LOCALES_CHANGE = "intl:app-locales-changed"; const TOPIC_CONTENT_DOCUMENT_INTERACTIVE = "content-document-interactive"; @@ -47,12 +44,6 @@ function AboutNewTabService() { this.toggleActivityStream(true); this.initialized = true; this.alreadyRecordedTopsitesPainted = false; - - if (IS_MAIN_PROCESS) { - AboutNewTab.init(); - } else if (IS_PRIVILEGED_PROCESS) { - Services.obs.addObserver(this, TOPIC_CONTENT_DOCUMENT_INTERACTIVE); - } } /* @@ -179,11 +170,6 @@ AboutNewTabService.prototype = { } case TOPIC_APP_QUIT: this.uninit(); - if (IS_MAIN_PROCESS) { - AboutNewTab.uninit(); - } else if (IS_PRIVILEGED_PROCESS) { - Services.obs.removeObserver(this, TOPIC_CONTENT_DOCUMENT_INTERACTIVE); - } break; case TOPIC_LOCALES_CHANGE: this.updatePrerenderedPath(); @@ -243,20 +229,7 @@ AboutNewTabService.prototype = { * the newtab page has no effect on the result of this function. */ get defaultURL() { - // Generate the desired activity stream resource depending on state, e.g., - // resource://activity-stream/prerendered/ar/activity-stream.html - // resource://activity-stream/prerendered/en-US/activity-stream-prerendered.html - // resource://activity-stream/prerendered/static/activity-stream-debug.html - return [ - "resource://activity-stream/prerendered/", - this._activityStreamPath, - "activity-stream", - this._activityStreamPrerender ? "-prerendered" : "", - // Debug version loads dev scripts but noscripts separately loads scripts - this._activityStreamDebug && !this._privilegedContentProcess ? "-debug" : "", - this._privilegedContentProcess ? "-noscripts" : "", - ".html", - ].join(""); + return "about:tor"; }, /* diff --git a/browser/components/preferences/in-content/home.xul b/browser/components/preferences/in-content/home.xul index 8c38ba68c2af..fc555a2f56af 100644 --- a/browser/components/preferences/in-content/home.xul +++ b/browser/components/preferences/in-content/home.xul @@ -37,7 +37,7 @@ class="check-home-page-controlled" data-preference-related="browser.startup.homepage"> <menupopup> - <menuitem value="0" data-l10n-id="home-mode-choice-default" /> + <menuitem value="0" label="&aboutTor.title;" /> <menuitem value="2" data-l10n-id="home-mode-choice-custom" /> <menuitem value="1" data-l10n-id="home-mode-choice-blank" /> </menupopup> @@ -79,7 +79,7 @@ onsyncfrompreference="return gHomePane.syncFromNewTabPref();" onsynctopreference="return gHomePane.syncToNewTabPref(this.value);"> <menupopup> - <menuitem value="0" data-l10n-id="home-mode-choice-default" /> + <menuitem value="0" label="&aboutTor.title;" /> <menuitem value="1" data-l10n-id="home-mode-choice-blank" /> </menupopup> </menulist> diff --git a/browser/components/preferences/in-content/preferences.xul b/browser/components/preferences/in-content/preferences.xul index 13c7bcc74ad8..3b07e4596907 100644 --- a/browser/components/preferences/in-content/preferences.xul +++ b/browser/components/preferences/in-content/preferences.xul @@ -17,7 +17,10 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/in-content/privacy.css"?> <?xml-stylesheet href="chrome://browser/content/securitylevel/securityLevelPreferences.css"?> -<!DOCTYPE page> +<!DOCTYPE page [ +<!ENTITY % aboutTorDTD SYSTEM "chrome://torbutton/locale/aboutTor.dtd"> + %aboutTorDTD; +]> <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" diff --git a/browser/modules/HomePage.jsm b/browser/modules/HomePage.jsm index f888f185c6a8..2519f3eaa754 100644 --- a/browser/modules/HomePage.jsm +++ b/browser/modules/HomePage.jsm @@ -17,7 +17,7 @@ ChromeUtils.defineModuleGetter( ); const kPrefName = "browser.startup.homepage"; -const kDefaultHomePage = "about:home"; +const kDefaultHomePage = "about:tor"; function getHomepagePref(useDefault) { let homePage;

1 0