Send crash reports to console URL specified in distribution.ini

Author: jonathanmendez

browser/branding/branding-common.mozbuild

@@ -40,3 +40,6 @@ def FirefoxBranding():
         JS_PREFERENCE_FILES += [
             "pref/firefox-enterprise.js",
         ]
+        FINAL_TARGET_FILES[".."].distribution += [
+            "distribution.ini",
+        ]

browser/branding/enterprise/distribution.ini

@@ -0,0 +1,5 @@
+# Default partner distribution configuration file
+# Must be replaced as part of a repack for Enterprise builds
+
+[Preferences]
+enterprise.console.address=https://console.enterfox.eu

browser/installer/package-manifest.in

@@ -168,6 +168,9 @@
 @BINPATH@/@MOZ_APP_NAME@
 #endif
 @RESPATH@/application.ini
+#ifdef MOZ_ENTERPRISE
+@RESPATH@/distribution/distribution.ini
+#endif
 #ifdef MOZ_UPDATER
 # update-settings.ini has been removed on macOS.
 #ifndef XP_MACOSX

browser/moz.configure

@@ -40,6 +40,8 @@ imply_option("--with-app-name", "firefox", when="--enable-enterprise")
 imply_option(
     "--with-branding", "browser/branding/enterprise", when="--enable-enterprise"
 )
+# Clear the default value to avoid mozilla.com url compiled into product
+imply_option("--with-crashreporter-url", "", when="--enable-enterprise")
 
 # Set UA name to "Firefox" for enterprise builds
 imply_option("MOZ_APP_UA_NAME", "Firefox", when="--enable-enterprise")

toolkit/xre/CreateAppData.cpp

@@ -6,6 +6,7 @@
 #include "nsXULAppAPI.h"
 #include "nsINIParser.h"
 #include "nsIFile.h"
+#include "nsURLHelper.h"
 #include "mozilla/XREAppData.h"
 
 // This include must appear early in the unified cpp file for toolkit/xre to
@@ -75,3 +76,35 @@ nsresult XRE_ParseAppData(nsIFile* aINIFile, XREAppData& aAppData) {
 
   return NS_OK;
 }
+
+#if defined(MOZ_ENTERPRISE)
+static nsresult ParseConsoleUrlFromDistribution(XREAppData& aAppData,
+                                                nsACString& consoleUrl) {
+  nsCOMPtr<nsIFile> distributionFile;
+  nsresult rv = aAppData.xreDirectory->Clone(getter_AddRefs(distributionFile));
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = distributionFile->Append(u"distribution"_ns);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv = distributionFile->Append(u"distribution.ini"_ns);
+  NS_ENSURE_SUCCESS(rv, rv);
+  nsINIParser parser;
+  rv = parser.Init(distributionFile);
+  NS_ENSURE_SUCCESS(rv, rv);
+  rv =
+      parser.GetString("Preferences", "enterprise.console.address", consoleUrl);
+  return rv;
+}
+
+nsresult XRE_ParseEnterpriseServerURL(XREAppData& aAppData) {
+  nsCString serverUrl;
+  nsresult rv = ParseConsoleUrlFromDistribution(aAppData, serverUrl);
+  NS_ENSURE_SUCCESS(rv, rv);
+  if (serverUrl.Last() != '/') {
+    serverUrl.Append('/');
+  }
+  serverUrl.Append("api/browser/crash-reports/submit");
+  aAppData.crashReporterURL = serverUrl.get();
+
+  return NS_OK;
+}
+#endif

toolkit/xre/nsAppRunner.cpp

@@ -4282,6 +4282,12 @@ int XREMain::XRE_mainInit(bool* aExitFlag) {
     }
   }
 
+#if defined(MOZ_ENTERPRISE)
+  XRE_ParseEnterpriseServerURL(*mAppData);
+  // Ignoring nsresult. If console url is not found in a release build, the
+  // default server url is empty and crash reports will fail to submit.
+#endif
+
   // Check sanity and correctness of app data.
 
   if (!mAppData->name) {

xpcom/build/nsXULAppAPI.h

@@ -250,6 +250,18 @@ nsresult XRE_AddManifestLocation(NSLocationType aType, nsIFile* aLocation);
  */
 nsresult XRE_ParseAppData(nsIFile* aINIFile, mozilla::XREAppData& aAppData);
 
+#if defined(MOZ_ENTERPRISE)
+/**
+ * Parse the distribution.ini file to read the enterprise console address. Use
+ * the console address to build the crash report URL to set in an existing
+ * nsXREAppData structure.
+ *
+ * @param aAppData The nsXREAppData structure on which to set the
+ * crashReporterURL.
+ */
+nsresult XRE_ParseEnterpriseServerURL(mozilla::XREAppData& aAppData);
+#endif
+
 const char* XRE_GeckoProcessTypeToString(GeckoProcessType aProcessType);
 const char* XRE_ChildProcessTypeToAnnotation(GeckoProcessType aProcessType);