Backed out changeset 9d6d0af194af (bug 1762920) for causing failures at test_crash_manager. CLOSED TREE

toolkit/crashreporter/CrashAnnotations.cpp

@@ -27,12 +27,12 @@ bool AnnotationFromString(Annotation& aResult, const char* aValue) {
   return true;
 }
 
-bool IsAnnotationAllowlistedForPing(Annotation aAnnotation) {
+bool IsAnnotationWhitelistedForPing(Annotation aAnnotation) {
   auto elem = find_if(
-      begin(kCrashPingAllowlist), end(kCrashPingAllowlist),
+      begin(kCrashPingWhitelist), end(kCrashPingWhitelist),
       [&aAnnotation](Annotation aElement) { return aElement == aAnnotation; });
 
-  return elem != end(kCrashPingAllowlist);
+  return elem != end(kCrashPingWhitelist);
 }
 
 }  // namespace CrashReporter

toolkit/crashreporter/CrashAnnotations.h.in

@@ -20,9 +20,9 @@ const char* const kAnnotationStrings[] = {
 ${strings}
 };
 
-// Allowlist of crash annotations that can be included in a crash ping
-const Annotation kCrashPingAllowlist[] = {
-${allowlist}
+// Whitelist of crash annotations that can be included in a crash ping
+const Annotation kCrashPingWhitelist[] = {
+${whitelist}
 };
 
 /**
@@ -46,14 +46,14 @@ static inline const char* AnnotationToString(Annotation aAnnotation) {
 bool AnnotationFromString(Annotation& aResult, const char* aValue);
 
 /**
- * Checks if the given crash annotation is allowlisted for inclusion in the
+ * Checks if the given crash annotation is whitelisted for inclusion in the
  * crash ping.
  *
  * @param aAnnotation the crash annotation to be checked
  * @return true if the annotation can be included in the crash ping, false
  *         otherwise
  */
-bool IsAnnotationAllowlistedForPing(Annotation aAnnotation);
+bool IsAnnotationWhitelistedForPing(Annotation aAnnotation);
 
 /**
  * Abstract annotation writer, this is needed only for code that writes out

toolkit/crashreporter/CrashAnnotations.yaml

@@ -8,7 +8,7 @@
 # Additionally a field can have the following optional fields:
 # - altname: A string that will be used when writing out the annotation to the
 #   .extra file instead of the annotation name
-# - ping: A boolean that indicates whether the annotation is allowlisted for
+# - ping: A boolean that indicates whether the annotation is whitelisted for
 #   going into the crash ping, if not specified this defaults to false
 
 A11yHandlerRegistered:

toolkit/crashreporter/client/ping.cpp

@@ -123,7 +123,7 @@ static Json::Value CreateMetadataNode(const Json::Value& aExtra) {
     Annotation annotation;
 
     if (AnnotationFromString(annotation, iter.memberName())) {
-      if (IsAnnotationAllowlistedForPing(annotation)) {
+      if (IsAnnotationWhitelistedForPing(annotation)) {
         node[iter.memberName()] = *iter;
       }
     }

toolkit/crashreporter/generate_crash_reporter_sources.py

@@ -71,8 +71,8 @@ def read_template(template_filename):
     return template
 
 
-def extract_crash_ping_allowlist(annotations):
-    """Extract an array holding the names of the annotations allowlisted for
+def extract_crash_ping_whitelist(annotations):
+    """Extract an array holding the names of the annotations whitelisted for
     inclusion in the crash ping."""
 
     return [
@@ -122,13 +122,13 @@ def generate_header(template, annotations):
     """Generate a header by filling the template with the the list of
     annotations and return it as a string."""
 
-    allowlist = extract_crash_ping_allowlist(annotations)
+    whitelist = extract_crash_ping_whitelist(annotations)
 
     return template_header + string.Template(template).substitute(
         {
             "enum": generate_enum(annotations),
             "strings": generate_strings(annotations),
-            "allowlist": generate_array_initializer(allowlist),
+            "whitelist": generate_array_initializer(whitelist),
         }
     )
 
@@ -167,11 +167,11 @@ def generate_java_array_initializer(contents):
 def generate_class(template, annotations):
     """Fill the class template from the list of annotations."""
 
-    allowlist = extract_crash_ping_allowlist(annotations)
+    whitelist = extract_crash_ping_whitelist(annotations)
 
     return template_header + string.Template(template).substitute(
         {
-            "allowlist": generate_java_array_initializer(allowlist),
+            "whitelist": generate_java_array_initializer(whitelist),
         }
     )
 
@@ -188,8 +188,8 @@ def emit_class(output, annotations_filename):
      * are kept in sync with the other C++ and JS users.
      */
     public class CrashReporterConstants {
-        public static final String[] ANNOTATION_ALLOWLIST = {
-    ${allowlist}
+        public static final String[] ANNOTATION_WHITELIST = {
+    ${whitelist}
         };
     }"""
     )

toolkit/xre/nsAppRunner.cpp

@@ -1887,15 +1887,15 @@ nsXULAppInfo::RemoveCrashReportAnnotation(const nsACString& key) {
 }
 
 NS_IMETHODIMP
-nsXULAppInfo::IsAnnotationAllowlistedForPing(const nsACString& aValue,
-                                             bool* aIsAllowlisted) {
+nsXULAppInfo::IsAnnotationWhitelistedForPing(const nsACString& aValue,
+                                             bool* aIsWhitelisted) {
   CrashReporter::Annotation annotation;
 
   if (!AnnotationFromString(annotation, PromiseFlatCString(aValue).get())) {
     return NS_ERROR_INVALID_ARG;
   }
 
-  *aIsAllowlisted = CrashReporter::IsAnnotationAllowlistedForPing(annotation);
+  *aIsWhitelisted = CrashReporter::IsAnnotationWhitelistedForPing(annotation);
 
   return NS_OK;
 }
@@ -5490,7 +5490,7 @@ nsresult XREMain::XRE_mainRun() {
 
     // As FilePreferences need the profile directory, we must initialize right
     // here.
-    mozilla::FilePreferences::InitDirectoriesAllowlist();
+    mozilla::FilePreferences::InitDirectoriesWhitelist();
     mozilla::FilePreferences::InitPrefs();
 
     OverrideDefaultLocaleIfNeeded();

toolkit/xre/nsEmbedFunctions.cpp

@@ -720,7 +720,7 @@ nsresult XRE_InitChildProcess(int aArgc, char* aArgv[],
       if (XRE_GetProcessType() != GeckoProcessType_RemoteSandboxBroker) {
         // Remote sandbox launcher process doesn't have prerequisites for
         // these...
-        mozilla::FilePreferences::InitDirectoriesAllowlist();
+        mozilla::FilePreferences::InitDirectoriesWhitelist();
         mozilla::FilePreferences::InitPrefs();
         OverrideDefaultLocaleIfNeeded();
       }

xpcom/io/FilePreferences.cpp

@@ -26,7 +26,7 @@ static StaticMutex sMutex MOZ_UNANNOTATED;
 static bool sBlockUNCPaths = false;
 typedef nsTArray<nsString> WinPaths;
 
-static WinPaths& PathAllowlist() {
+static WinPaths& PathWhitelist() {
   sMutex.AssertCurrentThreadOwns();
 
   static WinPaths sPaths;
@@ -71,7 +71,7 @@ static void AllowUNCDirectory(char const* directory) {
     return;
   }
 
-  // The allowlist makes sense only for UNC paths, because this code is used
+  // The whitelist makes sense only for UNC paths, because this code is used
   // to block only UNC paths, hence, no need to add non-UNC directories here
   // as those would never pass the check.
   if (!StringBeginsWith(path, u"\\\\"_ns)) {
@@ -80,8 +80,8 @@ static void AllowUNCDirectory(char const* directory) {
 
   StaticMutexAutoLock lock(sMutex);
 
-  if (!PathAllowlist().Contains(path)) {
-    PathAllowlist().AppendElement(path);
+  if (!PathWhitelist().Contains(path)) {
+    PathWhitelist().AppendElement(path);
   }
 }
 
@@ -119,7 +119,7 @@ void InitPrefs() {
       (sForbiddenPathsEmpty = ForbiddenPaths().Length() == 0);
 }
 
-void InitDirectoriesAllowlist() {
+void InitDirectoriesWhitelist() {
   // NS_GRE_DIR is the installation path where the binary resides.
   AllowUNCDirectory(NS_GRE_DIR);
   // NS_APP_USER_PROFILE_50_DIR and NS_APP_USER_PROFILE_LOCAL_50_DIR are the two
@@ -278,7 +278,7 @@ bool IsBlockedUNCPath(const nsAString& aFilePath) {
 
   StaticMutexAutoLock lock(sMutex);
 
-  for (const auto& allowedPrefix : PathAllowlist()) {
+  for (const auto& allowedPrefix : PathWhitelist()) {
     if (StringBeginsWith(normalized, allowedPrefix)) {
       if (normalized.Length() == allowedPrefix.Length()) {
         return false;
@@ -358,9 +358,9 @@ bool StartsWithDiskDesignatorAndBackslash(const nsAString& aAbsolutePath) {
 
 void testing::SetBlockUNCPaths(bool aBlock) { sBlockUNCPaths = aBlock; }
 
-void testing::AddDirectoryToAllowlist(nsAString const& aPath) {
+void testing::AddDirectoryToWhitelist(nsAString const& aPath) {
   StaticMutexAutoLock lock(sMutex);
-  PathAllowlist().AppendElement(aPath);
+  PathWhitelist().AppendElement(aPath);
 }
 
 bool testing::NormalizePath(nsAString const& aPath, nsAString& aNormalized) {

xpcom/io/FilePreferences.h

@@ -10,7 +10,7 @@ namespace mozilla {
 namespace FilePreferences {
 
 void InitPrefs();
-void InitDirectoriesAllowlist();
+void InitDirectoriesWhitelist();
 bool IsBlockedUNCPath(const nsAString& aFilePath);
 
 #ifdef XP_WIN
@@ -31,7 +31,7 @@ extern const nsLiteralString kDevicePathSpecifier;
 namespace testing {
 
 void SetBlockUNCPaths(bool aBlock);
-void AddDirectoryToAllowlist(nsAString const& aPath);
+void AddDirectoryToWhitelist(nsAString const& aPath);
 bool NormalizePath(nsAString const& aPath, nsAString& aNormalized);
 
 }  // namespace testing

xpcom/system/nsICrashReporter.idl

@@ -99,7 +99,7 @@ interface nsICrashReporter : nsISupports
   void removeCrashReportAnnotation(in AUTF8String key);
 
   /**
-   * Checks if an annotation is allowlisted for inclusion in the crash ping.
+   * Checks if an annotation is whitelisted for inclusion in the crash ping.
    *
    * @param key
    *        Name of a known crash annotation constant.
@@ -108,7 +108,7 @@ interface nsICrashReporter : nsISupports
              included in the crash ping, false otherwise.
    * @throw NS_ERROR_INVALID_ARG if key contains an invalid value.
    */
-  boolean isAnnotationAllowlistedForPing(in ACString value);
+  boolean isAnnotationWhitelistedForPing(in ACString value);
 
   /**
    * Append some data to the "Notes" field, to be submitted with a crash report.

xpcom/tests/gtest/TestFilePreferencesWin.cpp

@@ -126,7 +126,7 @@ TEST(FilePreferencesWin, AccessUNC)
   rv = lf->InitWithPath(u"\\\\nice\\..\\evil\\share"_ns);
   ASSERT_EQ(rv, NS_ERROR_FILE_ACCESS_DENIED);
 
-  mozilla::FilePreferences::testing::AddDirectoryToAllowlist(u"\\\\nice"_ns);
+  mozilla::FilePreferences::testing::AddDirectoryToWhitelist(u"\\\\nice"_ns);
 
   rv = lf->InitWithPath(u"\\\\nice\\share"_ns);
   ASSERT_EQ(rv, NS_OK);