GitLab

at 2023-03-10T09:44:43+01:00

fixup! Bug 41149: Re-enable DLL injection protection in all builds not just nightlies

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Changed BASE_BROWSER with BASE_BROWSER_VERSION.

fixup! Bug 41599: Always return an empty string as network ID

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Changed BASE_BROWSER with BASE_BROWSER_VERSION.

fixup! Bug 41108: Remove privileged macOS installation from 102

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Changed BASE_BROWSER with BASE_BROWSER_VERSION.

fixup! Base Browser's .mozconfigs.

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Removed the --enable-base-browser flag and the BASE_BROWSER macro and
added --with-base-browser-version to the -dev mozconfig.

fixup! Bug 25741: TBA: Disable GeckoNetworkManager

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Changed TOR_BROWSER_VERSION to TOR_BROWSER.

fixup! Bug 31575: Disable Firefox Home (Activity Stream)

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Changed BASE_BROWSER with BASE_BROWSER_VERSION.

fixup! Bug 31740: Remove some unnecessary RemoteSettings instances

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Changed BASE_BROWSER with BASE_BROWSER_VERSION.

fixup! Firefox preference overrides.

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Changed TOR_BROWSER_VERSION with BASE_BROWSER_VERSION.

fixup! Bug 41542: Disable the creation of a default profile

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Changed TOR_BROWSER_VERSION with BASE_BROWSER_VERSION.

          nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |

          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

          nsIAboutModule::IS_SECURE_CHROME_UI},

-#ifndef BASE_BROWSER

+#ifndef BASE_BROWSER_VERSION

     {"firefoxview", "chrome://browser/content/firefoxview.html",

      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI |

          nsIAboutModule::HIDE_FROM_ABOUTABOUT},

          nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS |

          nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

          nsIAboutModule::ALLOW_SCRIPT},

-#ifndef BASE_BROWSER

+#ifndef BASE_BROWSER_VERSION

     {"pocket-saved", "chrome://pocket/content/panels/saved.html",

      nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |

          nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |

 # See bug #41131

 ac_add_options --disable-backgroundtasks

-ac_add_options --enable-base-browser

-

 # Disable telemetry

 ac_add_options MOZ_TELEMETRY_REPORTING=

 ac_add_options --enable-proxy-bypass-protection

 ac_add_options --disable-system-policies

-ac_add_options --enable-base-browser

-

 # Disable telemetry

 ac_add_options MOZ_TELEMETRY_REPORTING=

 #endif

     {"telemetry", "chrome://global/content/aboutTelemetry.xhtml",

      nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI},

-#ifndef BASE_BROWSER

+#ifndef BASE_BROWSER_VERSION

     {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml",

      nsIAboutModule::ALLOW_SCRIPT},

 #endif

 // used by update service to decide whether or not to

 // automatically download an update

 pref("app.update.autodownload", "wifi");

-#ifdef TOR_BROWSER_VERSION

+#ifdef BASE_BROWSER_VERSION

 pref("app.update.url.android", "");

 #else

 pref("app.update.url.android", "https://aus5.mozilla.org/update/4/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%MOZ_VERSION%/update.xml");

       mPaused = false;

       // Monitor network status and send change notifications to Gecko

       // while active.

-      if (BuildConfig.TOR_BROWSER_VERSION == "") {

+      if (!BuildConfig.TOR_BROWSER) {

         GeckoNetworkManager.getInstance().start(GeckoAppShell.getApplicationContext());

+      } else {

+        Log.d(LOGTAG, "Tor Browser: skip GeckoNetworkManager startup"); 

       }

+

     }

     @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)

       Log.d(LOGTAG, "Lifecycle: onPause");

       mPaused = true;

       // Stop monitoring network status while inactive.

-      if (BuildConfig.TOR_BROWSER_VERSION == "") {

+      if (!BuildConfig.TOR_BROWSER) {

         GeckoNetworkManager.getInstance().stop();

       }

       GeckoThread.onPause();

 set_config("ZLIB_IN_MOZGLUE", zlib_in_mozglue)

 set_define("ZLIB_IN_MOZGLUE", zlib_in_mozglue)

-option(

-    "--enable-base-browser",

-    help="Enable Base Browser"

-)

-

-set_config("BASE_BROWSER", True, when="--enable-base-browser")

-set_define("BASE_BROWSER", True, when="--enable-base-browser")

-

 option(

     "--with-relative-data-dir",

 set_define("RELATIVE_DATA_DIR", relative_data_dir)

+option(

+    "--with-base-browser-version",

+    nargs=1,

+    help="Set the Base Browser version, e.g., 7.0a1"

+)

+

+

+@depends("--with-base-browser-version")

+def base_browser_version(value):

+    if not value:

+        die(

+            "--with-base-browser-version is required for Base Browser and derived browsers."

+        )

+    return value[0]

+

+

+@depends("--with-base-browser-version")

+def base_browser_version_quoted(value):

+    if not value:

+        die(

+            "--with-base-browser-version is required for Base Browser and derived browsers."

+        )

+    if '"' in value or "\\" in value:

+        die("--with-base-browser-version cannot contain \" or \\.")

+    return '"{}"'.format(value[0])

+

+

+set_define("BASE_BROWSER_VERSION", base_browser_version)

+set_define("BASE_BROWSER_VERSION_QUOTED", base_browser_version_quoted)

+

+

 # Please do not add configure checks from here on.

 # Fallthrough to autoconf-based configure

 ac_add_options --disable-strip

 ac_add_options --disable-install-strip

+ac_add_options --with-base-browser-version=dev-build

 NS_IMETHODIMP

 nsAndroidNetworkLinkService::GetNetworkID(nsACString& aNetworkID) {

-#ifdef BASE_BROWSER

+#ifdef BASE_BROWSER_VERSION

   aNetworkID.Truncate();

 #else

   if (!mNetlinkSvc) {

 NS_IMETHODIMP

 nsNetworkLinkService::GetNetworkID(nsACString& aNetworkID) {

-#ifdef BASE_BROWSER

+#ifdef BASE_BROWSER_VERSION

   aNetworkID.Truncate();

 #else

   if (!mNetlinkSvc) {

 NS_IMETHODIMP

 nsNetworkLinkService::GetNetworkID(nsACString& aNetworkID) {

-#ifdef BASE_BROWSER

+#ifdef BASE_BROWSER_VERSION

   aNetworkID.Truncate();

 #else

   MutexAutoLock lock(mMutex);

 }

 void NetlinkService::GetNetworkID(nsACString& aNetworkID) {

-#ifdef BASE_BROWSER

+#ifdef BASE_BROWSER_VERSION

   aNetworkID.Truncate();

 #else

   MutexAutoLock lock(mMutex);

 NS_IMETHODIMP

 nsNotifyAddrListener::GetNetworkID(nsACString& aNetworkID) {

-#ifdef BASE_BROWSER

+#ifdef BASE_BROWSER_VERSION

   aNetworkID.Truncate();

 #else

   MutexAutoLock lock(mMutex);

   MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@",

   ANDROID_PACKAGE_NAME: "@ANDROID_PACKAGE_NAME@",

+  BASE_BROWSER_VERSION: "@BASE_BROWSER_VERSION@",

+

   DEBUG_JS_MODULES: "@DEBUG_JS_MODULES@",

   MOZ_BING_API_CLIENTID: "@MOZ_BING_API_CLIENTID@",

       // this behavior through a build-time flag, should Mozilla be interested

       // in taking it.

       // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174

-#ifndef BASE_BROWSER

+#ifndef BASE_BROWSER_VERSION

       // If there is only one profile and it isn't meant to be the profile that

       // older versions of Firefox use then we must create a default profile

       // for older versions of Firefox to avoid the existing profile being

   LaunchTask(@"/usr/bin/xattr", arguments);

 }

-#if defined(MOZ_UPDATER) && !defined(BASE_BROWSER)

+#if defined(MOZ_UPDATER) && !defined(BASE_BROWSER_VERSION)

 bool LaunchElevatedDmgInstall(NSString* aBundlePath, NSArray* aArguments) {

   NSTask* task;

   if (@available(macOS 10.13, *)) {

   bool triedElevatedInstall = false;

-#if defined(MOZ_UPDATER) && !defined(BASE_BROWSER)

+#if defined(MOZ_UPDATER) && !defined(BASE_BROWSER_VERSION)

   // The installation may have been unsuccessful if the user did not have the

   // rights to write to the Applications directory. Check for this situation and

   // launch an elevated installation if necessary. Rather than creating a new,

   return ret;

 }

-#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER)

+#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER_VERSION)

 // Map of specific thread proc addresses we should block. In particular,

 // LoadLibrary* APIs which indicate DLL injection

 static void* gStartAddressesToBlock[4];

     return false;

   }

-#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER)

+#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER_VERSION)

   for (auto p : gStartAddressesToBlock) {

     if (p == aStartAddress) {

       return true;

     }

   }

-#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER)

+#if defined(NIGHTLY_BUILD) || defined(BASE_BROWSER_VERSION)

   // Populate a list of thread start addresses to block.

   HMODULE hKernel = GetModuleHandleW(L"kernel32.dll");

   if (hKernel) {

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits:

18 changed files:

Changes: